me/guix
Archived
1
0
Fork 0
Code Activity

gnu: qgis: Update to 3.30.1.

Browse source 
* gnu/packages/geo.scm (qgis): Update to 3.30.1.
  [arguments]: Define GISBASE environment variable during tests as it
  is used to find Grass GIS. (later in the installed version of QGis the
  same environment variable has already been set.)
  Execute tests in parallel.
  Update list of disabled broken tests. Try to classify failure reasons
  (network, missing/incomplete dependencies). There are still a lot of
  tests with unknown failure reasons.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
Felix Gruber 2023-04-02 17:45:51 +00:00 • committed by Guillaume Le Vaillant
parent 2bb577be93
commit fbb70bbc17
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 53 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
gnu/packages/geo.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2020, 2021, 2022 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2020, 2021, 2022, 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021, 2023 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021, 2023 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
@ -2464,14 +2464,14 @@ growing set of geoscientific methods.")
(define-public qgis (define-public qgis
(package (package
(name "qgis") (name "qgis")
(version "3.26.2") (version "3.30.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://qgis.org/downloads/qgis-" (uri (string-append "https://qgis.org/downloads/qgis-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 "1hsq3wchsf7db7134fgg9xzzap35q1s4r6649d0krbw80xw5asca")))) (base32 "0mdgqyqr3nswp5qfpjrpr35lxizcrz73a1gs3ddxsd1xr9amzb5s"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:modules ((guix build cmake-build-system) `(#:modules ((guix build cmake-build-system)
@ -2513,20 +2513,56 @@ growing set of geoscientific methods.")
(("\\$\\(git rev-parse --show-toplevel\\)") (("\\$\\(git rev-parse --show-toplevel\\)")
(getcwd))))) (getcwd)))))
(replace 'check (replace 'check
(lambda* (#:key inputs tests? #:allow-other-keys) (lambda* (#:key inputs outputs tests? parallel-tests?
#:allow-other-keys)
(when tests? (when tests?
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
(setenv "TRAVIS" "true") (setenv "TRAVIS" "true")
(setenv "CTEST_OUTPUT_ON_FAILURE" "1") (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
(let* ((out (assoc-ref outputs "out"))
(grass-version ,(package-version grass))
(grass-majorminor (string-join
(list-head
(string-split grass-version #\.) 2)
""))
(grass (string-append (assoc-ref inputs "grass")
"/grass" grass-majorminor)))
(setenv "GISBASE" grass))
(invoke "ctest" (invoke "ctest"
"-j" (if parallel-tests?
(number->string (parallel-job-count))
"1")
"-E" (string-join "-E" (string-join
'(;; Disable tests that require network access '(;; Disable tests that require network access
"PyQgsExternalStorageAwsS3"
"PyQgsExternalStorageWebDav"
"qgis_filedownloader" "qgis_filedownloader"
"test_core_networkaccessmanager"
"test_core_tiledownloadmanager"
"test_gui_filedownloader"
"test_provider_wcsprovider"
;; Disable tests that need OGR built with
;; libspatialite support
"PyQgsAttributeTableModel"
"PyQgsOGRProviderSqlite"
"PyQgsWFSProvider"
"PyQgsOapifProvider"
;; Disable tests that need Python compiled
;; with loadable SQLite extensions.
"PyQgsFieldFormattersTest"
"PyQgsSpatialiteProvider"
"PyQgsLayerDependencies"
"PyQgsDBManagerGpkg"
"PyQgsDBManagerSpatialite"
;; Disable tests that need poppler (with Cairo)
"PyQgsLayoutExporter"
"PyQgsPalLabelingLayout"
;; Disable tests that need Orfeo ToolBox
"ProcessingOtbAlgorithmsTest"
;; TODO: Find why the following tests fail ;; TODO: Find why the following tests fail
"ProcessingQgisAlgorithmsTestPt1" "ProcessingQgisAlgorithmsTestPt1"
"ProcessingQgisAlgorithmsTestPt2"
"ProcessingQgisAlgorithmsTestPt3" "ProcessingQgisAlgorithmsTestPt3"
"ProcessingQgisAlgorithmsTestPt4" "ProcessingQgisAlgorithmsTestPt4"
"ProcessingGdalAlgorithmsRasterTest" "ProcessingGdalAlgorithmsRasterTest"
@ -2535,68 +2571,42 @@ growing set of geoscientific methods.")
"ProcessingGrass7AlgorithmsRasterTestPt1" "ProcessingGrass7AlgorithmsRasterTestPt1"
"ProcessingGrass7AlgorithmsRasterTestPt2" "ProcessingGrass7AlgorithmsRasterTestPt2"
"ProcessingGrass7AlgorithmsVectorTest" "ProcessingGrass7AlgorithmsVectorTest"
"ProcessingOtbAlgorithmsTest"
"test_core_authmanager" "test_core_authmanager"
"test_core_compositionconverter" "test_core_compositionconverter"
"test_core_coordinatereferencesystem" "test_core_expression"
"test_core_gdalutils" "test_core_gdalutils"
"test_core_labelingengine"
"test_core_layout"
"test_core_layouthtml"
"test_core_layoutlabel"
"test_core_layoutmultiframe"
"test_core_layoutpicture" "test_core_layoutpicture"
"test_core_legendrenderer" "test_core_pointcloudlayerexporter"
"test_core_networkaccessmanager" "test_core_projectstorage"
"test_core_rasterfilewriter" "test_core_coordinatereferencesystem"
"test_core_tiledownloadmanager"
"test_gui_dualview"
"test_gui_htmlwidgetwrapper"
"test_gui_filedownloader"
"test_gui_queryresultwidget" "test_gui_queryresultwidget"
"test_provider_copcprovider"
"test_analysis_processingalgspt1"
"test_analysis_processingalgspt2" "test_analysis_processingalgspt2"
"test_analysis_processing" "test_analysis_processing"
"test_provider_wcsprovider" "test_app_gpsintegration"
"qgis_grassprovidertest7"
"test_app_gpsinformationwidget"
"PyQgsAnnotation" "PyQgsAnnotation"
"PyQgsAttributeTableModel"
"PyQgsAuthenticationSystem" "PyQgsAuthenticationSystem"
"PyQgsExternalStorageWebDAV" "PyQgsDatumTransform"
"PyQgsFieldFormattersTest"
"PyQgsFileUtils" "PyQgsFileUtils"
"PyQgsGeometryTest" "PyQgsGeometryTest"
"PyQgsGoogleMapsGeocoder" "PyQgsGoogleMapsGeocoder"
"PyQgsGroupLayer"
"PyQgsHashLineSymbolLayer" "PyQgsHashLineSymbolLayer"
"PyQgsLayoutExporter"
"PyQgsLayoutHtml" "PyQgsLayoutHtml"
"PyQgsLineSymbolLayers" "PyQgsLineSymbolLayers"
"PyQgsMapLayer" "PyQgsMapLayer"
"PyQgsNetworkContentFetcherRegistry"
"PyQgsOGRProviderGpkg" "PyQgsOGRProviderGpkg"
"PyQgsOGRProviderSqlite" "PyQgsProcessExecutablePt1"
"PyQgsPalLabelingCanvas" "PyQgsProcessExecutablePt2"
"PyQgsPalLabelingLayout"
"PyQgsPalLabelingPlacement"
"PyQgsProcessExecutable"
"PyQgsProviderConnectionGpkg" "PyQgsProviderConnectionGpkg"
"PyQgsProviderConnectionSpatialite" "PyQgsProviderConnectionSpatialite"
"PyQgsOGRProvider" "PyQgsOGRProvider"
"PyQgsSpatialiteProvider"
"PyQgsVectorFileWriter" "PyQgsVectorFileWriter"
"PyQgsVectorLayerEditBuffer" "PyQgsVectorLayerEditBuffer"
"PyQgsVectorLayerEditBufferGroup"
"PyQgsVectorLayerProfileGenerator"
"PyQgsVirtualLayerProvider" "PyQgsVirtualLayerProvider"
"PyQgsWFSProvider"
"PyQgsWFSProviderGUI"
"PyQgsOapifProvider"
"PyQgsLayerDependencies"
"PyQgsDBManagerGpkg"
"PyQgsDBManagerSpatialite"
"PyQgsAuxiliaryStorage" "PyQgsAuxiliaryStorage"
"PyQgsSelectiveMasking" "PyQgsSelectiveMasking"
"qgis_shellcheck"
"qgis_sipify" "qgis_sipify"
"qgis_sip_include" "qgis_sip_include"
"qgis_sip_uptodate") "qgis_sip_uptodate")
@ -2665,6 +2675,7 @@ growing set of geoscientific methods.")
qtdeclarative-5 qtdeclarative-5
qtkeychain qtkeychain
qtlocation qtlocation
qtmultimedia-5
qtserialport qtserialport
qtsvg-5 qtsvg-5
qwt qwt