From patchwork Sun Apr 2 17:45:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 48943 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB4B117286; Sun, 2 Apr 2023 18:48:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 57D7F17183 for ; Sun, 2 Apr 2023 18:48:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pj1oE-00034f-G7; Sun, 02 Apr 2023 13:48:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pj1oA-0002zA-TB for guix-patches@gnu.org; Sun, 02 Apr 2023 13:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pj1oA-0002c6-L5 for guix-patches@gnu.org; Sun, 02 Apr 2023 13:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pj1oA-000336-Ee for guix-patches@gnu.org; Sun, 02 Apr 2023 13:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62622] [PATCH 8/8] gnu: qgis: Update to 3.30.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Apr 2023 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62622@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 62622-submit@debbugs.gnu.org id=B62622.168045763511491 (code B ref 62622); Sun, 02 Apr 2023 17:48:02 +0000 Received: (at 62622) by debbugs.gnu.org; 2 Apr 2023 17:47:15 +0000 Received: from localhost ([127.0.0.1]:42596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj1nO-0002zG-CH for submit@debbugs.gnu.org; Sun, 02 Apr 2023 13:47:14 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj1nM-0002yl-IK for 62622@debbugs.gnu.org; Sun, 02 Apr 2023 13:47:13 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0C342240256 for <62622@debbugs.gnu.org>; Sun, 2 Apr 2023 19:47:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1680457627; bh=cljCUELveL63GRDlrsRxGMpAnONlHCRT8GTaHGPTZrs=; h=From:To:Cc:Subject:Date:From; b=TT2SqA4lyQmcL/gbLDnvoqfswbBFxx9a6sUOZKom8Lob6Up73vvq1mweBAJSDdePw CkxnJKCU9Sal318SbQJkwhwN/l4A7zJ8jKzp+oLAFwWuyguBJ6XLSPHhOubh1K9Z7m 1C2KDSAkPtvww/GkkPjdKKHXqiZd3eA66Gwt3oCcSlxX9fMn4eEhSb3+A3/sO2R7j7 V48E17eqRtvwARjOsnZPLIg2rslmQdSpkjsx8HyGr0qsfDYbwLh5e/gbj1JdflLv/K pTwyC9zasbLdl+A5O/ddveJhKu4hmW7Jfvt6nm8RaAhiioR4oJHEW/0pZcVtwg7Dik WFt26ByHypaYQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PqM0p3xTKz6tw5; Sun, 2 Apr 2023 19:47:06 +0200 (CEST) From: Felix Gruber Date: Sun, 2 Apr 2023 17:45:51 +0000 Message-Id: <20230402174551.159212-8-felgru@posteo.net> In-Reply-To: <20230402174241.158923-1-felgru@posteo.net> References: <20230402174241.158923-1-felgru@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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. --- gnu/packages/geo.scm | 95 ++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 76a42c4140..77f6f853b4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019, 2020 Hartmut Goebel ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2020 Christopher Baines -;;; Copyright © 2020, 2021, 2022 Felix Gruber +;;; Copyright © 2020, 2021, 2022, 2023 Felix Gruber ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021, 2023 Vinicius Monego ;;; Copyright © 2021 Clément Lassieur @@ -2464,14 +2464,14 @@ (define-public saga (define-public qgis (package (name "qgis") - (version "3.26.2") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "https://qgis.org/downloads/qgis-" version ".tar.bz2")) (sha256 - (base32 "1hsq3wchsf7db7134fgg9xzzap35q1s4r6649d0krbw80xw5asca")))) + (base32 "0mdgqyqr3nswp5qfpjrpr35lxizcrz73a1gs3ddxsd1xr9amzb5s")))) (build-system cmake-build-system) (arguments `(#:modules ((guix build cmake-build-system) @@ -2513,20 +2513,56 @@ (define-public qgis (("\\$\\(git rev-parse --show-toplevel\\)") (getcwd))))) (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) + (lambda* (#:key inputs outputs tests? parallel-tests? + #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") (setenv "TRAVIS" "true") (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" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") "-E" (string-join '(;; Disable tests that require network access + "PyQgsExternalStorageAwsS3" + "PyQgsExternalStorageWebDav" "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 "ProcessingQgisAlgorithmsTestPt1" - "ProcessingQgisAlgorithmsTestPt2" "ProcessingQgisAlgorithmsTestPt3" "ProcessingQgisAlgorithmsTestPt4" "ProcessingGdalAlgorithmsRasterTest" @@ -2535,68 +2571,42 @@ (define-public qgis "ProcessingGrass7AlgorithmsRasterTestPt1" "ProcessingGrass7AlgorithmsRasterTestPt2" "ProcessingGrass7AlgorithmsVectorTest" - "ProcessingOtbAlgorithmsTest" "test_core_authmanager" "test_core_compositionconverter" - "test_core_coordinatereferencesystem" + "test_core_expression" "test_core_gdalutils" - "test_core_labelingengine" - "test_core_layout" - "test_core_layouthtml" - "test_core_layoutlabel" - "test_core_layoutmultiframe" "test_core_layoutpicture" - "test_core_legendrenderer" - "test_core_networkaccessmanager" - "test_core_rasterfilewriter" - "test_core_tiledownloadmanager" - "test_gui_dualview" - "test_gui_htmlwidgetwrapper" - "test_gui_filedownloader" + "test_core_pointcloudlayerexporter" + "test_core_projectstorage" + "test_core_coordinatereferencesystem" "test_gui_queryresultwidget" + "test_provider_copcprovider" + "test_analysis_processingalgspt1" "test_analysis_processingalgspt2" "test_analysis_processing" - "test_provider_wcsprovider" - "qgis_grassprovidertest7" - "test_app_gpsinformationwidget" + "test_app_gpsintegration" "PyQgsAnnotation" - "PyQgsAttributeTableModel" "PyQgsAuthenticationSystem" - "PyQgsExternalStorageWebDAV" - "PyQgsFieldFormattersTest" + "PyQgsDatumTransform" "PyQgsFileUtils" "PyQgsGeometryTest" "PyQgsGoogleMapsGeocoder" + "PyQgsGroupLayer" "PyQgsHashLineSymbolLayer" - "PyQgsLayoutExporter" "PyQgsLayoutHtml" "PyQgsLineSymbolLayers" "PyQgsMapLayer" - "PyQgsNetworkContentFetcherRegistry" "PyQgsOGRProviderGpkg" - "PyQgsOGRProviderSqlite" - "PyQgsPalLabelingCanvas" - "PyQgsPalLabelingLayout" - "PyQgsPalLabelingPlacement" - "PyQgsProcessExecutable" + "PyQgsProcessExecutablePt1" + "PyQgsProcessExecutablePt2" "PyQgsProviderConnectionGpkg" "PyQgsProviderConnectionSpatialite" "PyQgsOGRProvider" - "PyQgsSpatialiteProvider" "PyQgsVectorFileWriter" "PyQgsVectorLayerEditBuffer" - "PyQgsVectorLayerEditBufferGroup" - "PyQgsVectorLayerProfileGenerator" "PyQgsVirtualLayerProvider" - "PyQgsWFSProvider" - "PyQgsWFSProviderGUI" - "PyQgsOapifProvider" - "PyQgsLayerDependencies" - "PyQgsDBManagerGpkg" - "PyQgsDBManagerSpatialite" "PyQgsAuxiliaryStorage" "PyQgsSelectiveMasking" - "qgis_shellcheck" "qgis_sipify" "qgis_sip_include" "qgis_sip_uptodate") @@ -2665,6 +2675,7 @@ (define-public qgis qtdeclarative-5 qtkeychain qtlocation + qtmultimedia-5 qtserialport qtsvg-5 qwt