From patchwork Fri Apr 22 20:25:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38757 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 91CFC27BBEA; Fri, 22 Apr 2022 21:27:12 +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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable 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 4C03F27BBE9 for ; Fri, 22 Apr 2022 21:27:12 +0100 (BST) Received: from localhost ([::1]:34090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzry-0003ci-JO for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzrr-0003cL-34 for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzrq-00056o-QV for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzrq-000254-Na for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 1/7] gnu: fenics-dolfin: Honor #:tests? flag. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591657850 (code B ref 54869); Fri, 22 Apr 2022 20:27:02 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:26:05 +0000 Received: from localhost ([127.0.0.1]:54734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqu-00022T-QO for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:05 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:33033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqn-00020t-90 for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:01 -0400 Date: Fri, 22 Apr 2022 20:25:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659150; bh=cy5N6sEH7Ittwuis31JaSRAb2xyGnHG3FZX/CHIZr8Y=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=HVzjVXdMnsEsQboxPjRNpCz7bli1TNLojqeC/SNsmYnzLuNpQf67dYr+vJJhLkz6z sw0msPN4H2icJIBaCDbVb9pM9i17VvoFXRLiOpgIBnkOLHhPovDtMzYvOO7pPtnT9d uprhJ/pSoHEiedRLLcjwgaAvi9RiBEBsrFh+aAefU5uKRRdqYFLBK3STKtS2LxXRFc 7HvsvUh7Hac6L6BO+TEXCpVLPhGJtnF5XlxTBiCqf6YCQZvZesOXNWMbF11r2Z3P1f giUuFRL0qlprCkjV8Wge6k2cIDD5y4bm4FpXPnLHpbodVGXnKdrZ0a79NusUKpczYN WuBr/gDSk7Zeg== From: "Paul A. Patience" Message-ID: <20220422202538.106338-2-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (fenics-dolfin)[source]: Remove trailing boolean. [arguments]: Adjust custom 'check' phase to honor the #:tests? flag. While here, remove trailing booleans. --- gnu/packages/simulation.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) -- 2.35.1 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 3f2d8e136d..757738e627 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -448,8 +448,7 @@ (define-public fenics-dolfin ;; Specify directory to find the header file. (("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back) (string-append front - "$ENV{CATCH_DIR}/include" back "\n"))) - #t)))) + "$ENV{CATCH_DIR}/include" back "\n"))))))) (build-system cmake-build-system) (inputs `(("blas" ,openblas) @@ -494,8 +493,7 @@ (define-public fenics-dolfin (setenv "SLEPC_DIR" (assoc-ref %build-inputs "slepc")) (setenv "SCOTCH_DIR" (assoc-ref %build-inputs "scotch")) (setenv "SUNDIALS_DIR" (assoc-ref %build-inputs "sundials")) - (setenv "UMFPACK_DIR" (assoc-ref %build-inputs "suitesparse")) - #t)) + (setenv "UMFPACK_DIR" (assoc-ref %build-inputs "suitesparse")))) (add-before 'check 'pre-check (lambda _ ;; The Dolfin repository uses git-lfs, whereby web links are @@ -546,15 +544,15 @@ (define-public fenics-dolfin "demo_mesh-quality_serial " "demo_mesh-quality_mpi " "demo_multimesh-stokes_serial " - ")\n") port))) - #t)) + ")\n") port))))) (replace 'check - (lambda _ - (and (invoke "make" "unittests") - (invoke "make" "demos") - (invoke "ctest" "-R" "unittests") - (invoke "ctest" "-R" "demo" "-R" "serial") - (invoke "ctest" "-R" "demo" "-R" "mpi"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "unittests") + (invoke "make" "demos") + (invoke "ctest" "-R" "unittests") + (invoke "ctest" "-R" "demo" "-R" "serial") + (invoke "ctest" "-R" "demo" "-R" "mpi"))))))) (home-page "https://bitbucket.org/fenics-project/dolfin/") (synopsis "Problem solving environment for differential equations") (description From patchwork Fri Apr 22 20:25:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38756 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 1297D27BBEA; Fri, 22 Apr 2022 21:26:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 CE9AC27BBE9 for ; Fri, 22 Apr 2022 21:26:20 +0100 (BST) Received: from localhost ([::1]:60934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzr9-0002gO-U7 for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:26:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzqs-0002eq-4W for guix-patches@gnu.org; Fri, 22 Apr 2022 16:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzqr-000525-QP for guix-patches@gnu.org; Fri, 22 Apr 2022 16:26:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzqr-00021t-Mm for guix-patches@gnu.org; Fri, 22 Apr 2022 16:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 2/7] gnu: fenics: Honor #:tests? flag. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591597776 (code B ref 54869); Fri, 22 Apr 2022 20:26:01 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:25:59 +0000 Received: from localhost ([127.0.0.1]:54722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqo-00021K-Qa for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:25:59 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:24829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqn-00020s-7h for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:25:57 -0400 Date: Fri, 22 Apr 2022 20:25:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659151; bh=IyRkrJ/iscAMnNHlhxkbRMD6EQdM4AvWh/QPRDsqeJY=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=MVNHe5lDJzAqIoWYgnQQTn6/16xSTWCJcC86LPm7e1wYSDF8dRUdhbeKCwQzhhYGK 0/kU1m8taP54sUm7ftkYb4nzD791gQxIbN57jMGjsv0LJQ1azYbNNKTASLOJvZsjBW 1phC1Z/gzFCOzPFqCZckeJDABxCPXQXBkjYVZkK0SwWhVwiZb8NXp2WMX1HKJyU9fk wjzMmagK31GGYuaAvDNxOg/VWqyaTQdJj6GJlXw8VQY3APgx5rx348mwmyZP8y90nE 7rGB1Xm7N0lLk/rMXRTWoObSXfi+zq0fhaxMBhn5H9jigasB7D5Xvu66/OY16cPqFp lhrjWGpU1+DBg== From: "Paul A. Patience" Message-ID: <20220422202538.106338-3-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (fenics)[arguments]: Adjust custom 'check' phase to honor the #:tests? flag. --- gnu/packages/simulation.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.35.1 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 757738e627..230ae62826 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -657,17 +657,18 @@ (define-public fenics ;; Restrict OpenBLAS to MPI-only in preference to MPI+OpenMP. (setenv "OPENBLAS_NUM_THREADS" "1"))) (replace 'check - (lambda _ - (with-directory-excursion "test" - ;; Note: The test test_snes_set_from_options() in the file - ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. - ;; Limit the number of jobs to 3 as 500 MiB of memory is used - ;; per process. - (invoke "mpirun" "-np" (number->string - (min 3 (parallel-job-count))) - "python" "-B" "-m" - "pytest" "unit" "--ignore" - "unit/nls/test_PETScSNES_solver.py")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + ;; Note: The test test_snes_set_from_options() in the file + ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. + ;; Limit the number of jobs to 3 as 500 MiB of memory is used + ;; per process. + (invoke "mpirun" "-np" (number->string + (min 3 (parallel-job-count))) + "python" "-B" "-m" + "pytest" "unit" "--ignore" + "unit/nls/test_PETScSNES_solver.py"))))) (add-after 'install 'install-demo-files (lambda* (#:key outputs #:allow-other-keys) (let* ((demos (string-append From patchwork Fri Apr 22 20:25:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38758 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 330BC27BBEA; Fri, 22 Apr 2022 21:27:20 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 E25CE27BBE9 for ; Fri, 22 Apr 2022 21:27:19 +0100 (BST) Received: from localhost ([::1]:34110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzs5-0003dq-82 for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:27:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzrq-0003cD-NJ for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzrq-00056j-Ek for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzrq-00024x-BJ for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 3/7] gnu: fenics: Fix sanity check. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591647844 (code B ref 54869); Fri, 22 Apr 2022 20:27:02 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:26:04 +0000 Received: from localhost ([127.0.0.1]:54732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqu-00022P-Di for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:04 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:17849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqp-00020y-8k for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:25:59 -0400 Date: Fri, 22 Apr 2022 20:25:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659153; bh=6Ky8g3IXs8eXHb+nd181R9ZQ1K/ufrz/PJLYqdQU4AE=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=YIZagn1s15p88SH0tGgCc59yM5n+ouNG5a6XxvZvUG64xbg3VO63RMqAZ1kzSDJTO mF9I8camAMbUjR5VkpDGjUuY5NRB+8Jn8E+yR/pXDjFR7BGWZN+SzI1/IEBB4CuweS wzSnSt728PUoEyLMII0/QW3HwVlNqfvIJrK9VPOOCKSzT1+sODc3txuyyxcpTzyiCo +ByqmkqrvvALLbikDaDtbmruhIfh2wBG71Eu176QAJyj6XFJD+wALKnoCVU6fgR0ff Rtv2RLHoHc98+o8SpY+o1Um7j4w6ag+XxzxLsw+srlR1kQ0cSeMvneIH+IhLrxI+Wo DQ7+efnZnAhxQ== From: "Paul A. Patience" Message-ID: <20220422202538.106338-4-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (fenics)[arguments]: Relax pybind11 requirement to appease the sanity check. --- gnu/packages/simulation.scm | 4 ++++ 1 file changed, 4 insertions(+) -- 2.35.1 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 230ae62826..b15743f747 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -607,6 +607,10 @@ (define-public fenics (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "python/setup.py" + (("pybind11==") "pybind11>=")))) (add-after 'patch-source-shebangs 'set-paths (lambda _ ;; Define paths to store locations. From patchwork Fri Apr 22 20:25:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38761 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 DB81627BBEA; Fri, 22 Apr 2022 21:27:37 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 AADCC27BBE9 for ; Fri, 22 Apr 2022 21:27:37 +0100 (BST) Received: from localhost ([::1]:34768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzsO-00045u-Ry for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:27:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzrr-0003cV-F2 for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzrr-00056v-6N for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzrr-00025B-3X for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 4/7] gnu: python-vedo: Honor #:tests? flag. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591697864 (code B ref 54869); Fri, 22 Apr 2022 20:27:03 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:26:09 +0000 Received: from localhost ([127.0.0.1]:54736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqz-00022m-6R for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:09 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:23428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzqs-000213-KM for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:02 -0400 Date: Fri, 22 Apr 2022 20:25:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659157; bh=Dwarics/nuuxaWFkfV7M5LbVN5sNoPDr2R7MwfVZUic=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=pJCrExw5k43qkaI15tU9fhr7PD+q7dmNvt3dWIN2osa/X9h8O5ou+LS6u2Pw/yM/R Id0KDb8+35WcMp3CvLoGftpEsdefvQStLmALkdFVt1TR780VlNbhpXt8gC+hHyvy0m U5ZtcgULejwa/jvZE8nFEsQD54N9P2zFAfMWafWq9R6DjZWfXhBDAbeN8wQzDyEgw+ o+OXno07GqCOmTcQi3QNuh16BLyAaBNfsbIOALsooXZVEc5bUY4S+vdgnSJ/36gDCI 8sYiUR4uLnJnHNW/Or3ZwCLbJe5NBo7pGdbpUOHGqcMBbW4e+fjNMbEOBqnp5Pa9nE x3/uA0GYpSTfA== From: "Paul A. Patience" Message-ID: <20220422202538.106338-5-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-science.scm (python-vedo)[arguments]: Adjust custom 'check' phase to honor the #:tests? flag. Also remove its trailing boolean. --- gnu/packages/python-science.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.35.1 diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 07d713e013..4538904b68 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -876,15 +876,15 @@ (define-public python-vedo (add-after 'build 'mpi-setup ,%openmpi-setup) (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (setenv "HOME" (getcwd)) - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "tests" - (for-each (lambda (dir) - (with-directory-excursion dir - (invoke "./run_all.sh"))) - '("common" "dolfin"))) - #t))))) + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "tests" + (for-each (lambda (dir) + (with-directory-excursion dir + (invoke "./run_all.sh"))) + '("common" "dolfin"))))))))) (inputs ; for the check phase `(("dolfin" ,fenics) ("pkgconfig" ,python-pkgconfig) From patchwork Fri Apr 22 20:25:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38759 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 1EFCF27BBEB; Fri, 22 Apr 2022 21:27:31 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 C30D427BBEA for ; Fri, 22 Apr 2022 21:27:30 +0100 (BST) Received: from localhost ([::1]:34268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzsH-0003kR-VW for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:27:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzrr-0003cd-RM for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzrr-000575-J5 for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzrr-00025J-Fk for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 5/7] gnu: python-vedo: Remove input labels. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591747887 (code B ref 54869); Fri, 22 Apr 2022 20:27:03 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:26:14 +0000 Received: from localhost ([127.0.0.1]:54740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzr3-000237-FB for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:13 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:50340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzr1-00022g-4E for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:11 -0400 Date: Fri, 22 Apr 2022 20:25:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659165; bh=RMA0eOqbrT54fixWwH1NksStjUAMXMEEGd8mFls+2xQ=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=GkUe6L2rQeye3qCscbcrB0ES4n7HwcFzss/h0eV4rRnEuXTQlfWR2cVjO1QCO0Rya XFoe0nWVoL+iWevsnCo+MW7AI+7TFyEWyTQuxIY0rhYaDhEBnVRtVCSEh/rhrApM2K 7Vx5g3uyqd+xntOHw8kekG8HPkWyfq7AUuAqBgBk5B1YOJ95sDjiSaOz6u911ir1j0 EcuTBbGaOTUXjHTuSsEuSC7oRu6CjwhVPKVhP9WDE6gX/BjRpYOiLCsemm+s9fAbRh ULEWQ7Xhd7k8Vl9pjLnzYJhTIq45uQ4+sMDKcSUXk43Opa1C0CqFZIi8qbAQ6P69W+ 0xlmfnmvigVKg== From: "Paul A. Patience" Message-ID: <20220422202538.106338-6-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-science.scm (python-vedo)[inputs]: Remove labels and sort the inputs. [propagated-inputs]: Remove labels. --- gnu/packages/python-science.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.35.1 diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 4538904b68..3afaa0efc2 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -886,14 +886,14 @@ (define-public python-vedo (invoke "./run_all.sh"))) '("common" "dolfin"))))))))) (inputs ; for the check phase - `(("dolfin" ,fenics) - ("pkgconfig" ,python-pkgconfig) - ("matplotlib" ,python-matplotlib))) + (list fenics + python-matplotlib + python-pkgconfig)) (native-inputs ; for python-pkgconfig (list pkg-config)) (propagated-inputs - `(("numpy" ,python-numpy) - ("vtk" ,vtk))) + (list python-numpy + vtk)) (home-page "https://github.com/marcomusy/vedo") (synopsis "Analysis and visualization of 3D objects and point clouds") From patchwork Fri Apr 22 20:26:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38762 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 23A8027BBEA; Fri, 22 Apr 2022 21:27:44 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 E28A327BBE9 for ; Fri, 22 Apr 2022 21:27:43 +0100 (BST) Received: from localhost ([::1]:35228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzsV-0004P8-4I for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzrs-0003dH-7m for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzrr-00057F-VE for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzrr-00025S-SN for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 6/7] gnu: python-vedo: Disable sanity check. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591767901 (code B ref 54869); Fri, 22 Apr 2022 20:27:03 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:26:16 +0000 Received: from localhost ([127.0.0.1]:54744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzr5-00023N-Ri for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:16 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:26483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzr3-00022j-E3 for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:13 -0400 Date: Fri, 22 Apr 2022 20:26:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659167; bh=lBCMndCQfxChZT7mt+/i3T9GxDaaJkAhWgGYfa7+2ww=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=q+hGHJXxRmcNSG/9aVSBM3tTpwKVUt4Khj3PkZ8zQAbKROaRt0TyUE+nfIZCDRZU9 tPCfG+HJ8lNHsQv87wZn55RewZA8i7YAjUbcGk09vPIPfgB3uKeSwTGqXVm6F/l5O+ 9vSqBv9t+O+UCy4OKPKXHxBF2s/Lhmv4RnSja1DjDt/npAxKFy6oQBr6mBz8te6Kvp EgQ/NXb3zRp33RiSEeBf3l4pX2LADo7QzDyYKP7JYkS+TKU/qQNiPEg1N50M4geF9o 6YqPlqkpYBjarMM+XzHZjceM9saC9KMb4Z6yDobaLGeeAXJhAVGv67JHII7MKHf03L 7Dd10ougkajkg== From: "Paul A. Patience" Message-ID: <20220422202538.106338-7-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-science.scm (python-vedo)[arguments]: Disable sanity check. --- gnu/packages/python-science.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.35.1 diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 3afaa0efc2..676ca6474e 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -884,7 +884,11 @@ (define-public python-vedo (for-each (lambda (dir) (with-directory-excursion dir (invoke "./run_all.sh"))) - '("common" "dolfin"))))))))) + '("common" "dolfin")))))) + ;; Disable the sanity check, which fails with the following error: + ;; + ;; ...checking requirements: ERROR: vedo==2021.0.3 DistributionNotFound(Requirement.parse('vtk'), {'vedo'}) + (delete 'sanity-check)))) (inputs ; for the check phase (list fenics python-matplotlib From patchwork Fri Apr 22 20:26:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 38760 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 4A2A027BBEA; Fri, 22 Apr 2022 21:27:31 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 BFD6727BBE9 for ; Fri, 22 Apr 2022 21:27:30 +0100 (BST) Received: from localhost ([::1]:34260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhzsH-0003kB-VW for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 16:27:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhzrs-0003eN-LT for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhzrs-00057L-C9 for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhzrs-00025Z-98 for guix-patches@gnu.org; Fri, 22 Apr 2022 16:27:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v3 7/7] gnu: python-vedo: Update to 2022.2.0. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Apr 2022 20:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54869@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 54869-submit@debbugs.gnu.org id=B54869.16506591827925 (code B ref 54869); Fri, 22 Apr 2022 20:27:04 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 20:26:22 +0000 Received: from localhost ([127.0.0.1]:54748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzrC-00023j-2Q for submit@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:22 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:35321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhzr9-00023J-5g for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 16:26:19 -0400 Date: Fri, 22 Apr 2022 20:26:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650659173; bh=CdadgJgTgdZLYvW9etF16obfhdI55/j0wBL6noUfDsY=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=aPg7WjU8kPKHt/p3FyY5Jk2xIRPfzUs2wM97Tnb6d7NqUWmL0WtHNdnlyPFdRVPGw y3pF109a7e/CpPehyut57IQqnfP9ChjUr7UAtvBsLNwOncSB2hsXuKFJvJUgZO7M8I 1zVgAWMHt+OHE7tUjUw3odRZiNpAJS6Zp0EH7A+MpQV41oFplSC+5ywFzGL7dHIrGF S6sYqdN97IAiGXpbHD+Y9rkEv8V5lwIvTZjtrUYbrScrLJCEi0eueUbk0DkCXYLpRF +O1hPZbIPSeMFpaaS32R+Z4KLnEWppaO4SxwZkTkn892CGM2wopWe7cM2DjJngthjr DI9XTDg/Ac8Pg== From: "Paul A. Patience" Message-ID: <20220422202538.106338-8-paul@apatience.com> In-Reply-To: <20220422202538.106338-1-paul@apatience.com> References: <20220422202538.106338-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-science.scm (python-vedo): Update to 2022.2.0. [arguments]: Add 'fix-tests' phase. [inputs]: Move fenics and python-matplotlib to propagated-inputs. Move python-pkgconfig from here... [native-inputs]: ...to here. [propagated-inputs]: Add python-deprecated (and fenics and python-matplotlib). [description]: Make description more accurate. --- gnu/packages/python-science.scm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) -- 2.35.1 diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 676ca6474e..ab307e31af 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Guillaume Le Vaillant +;;; Copyright © 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -858,21 +859,28 @@ (define-public python-upsetplot (define-public python-vedo (package (name "python-vedo") - (version "2021.0.3") + (version "2022.2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/marcomusy/vedo") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "18i3ajh5jzhpc86di15lwh4jv97jhm627ii877sa4yhv6abzjfpn")))) + "1hhv4xc4bphhd1zrnf7r6fpf65xvkdqmb1lh51qg1xpv91h2az0h")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + ;; These tests require online data. + (lambda _ + (substitute* "tests/common/test_actors.py" + (("^st = .*") "") + (("^assert isinstance\\(st\\.GetTexture\\(\\), .*") "")) + (delete-file "tests/common/test_pyplot.py"))) (add-after 'build 'mpi-setup ,%openmpi-setup) (replace 'check @@ -887,16 +895,16 @@ (define-public python-vedo '("common" "dolfin")))))) ;; Disable the sanity check, which fails with the following error: ;; - ;; ...checking requirements: ERROR: vedo==2021.0.3 DistributionNotFound(Requirement.parse('vtk'), {'vedo'}) + ;; ...checking requirements: ERROR: vedo==2022.2.0 DistributionNotFound(Requirement.parse('vtk<9.1.0'), {'vedo'}) (delete 'sanity-check)))) - (inputs ; for the check phase - (list fenics - python-matplotlib + (native-inputs + (list pkg-config python-pkgconfig)) - (native-inputs ; for python-pkgconfig - (list pkg-config)) (propagated-inputs - (list python-numpy + (list fenics + python-deprecated + python-matplotlib + python-numpy vtk)) (home-page "https://github.com/marcomusy/vedo") (synopsis @@ -907,8 +915,7 @@ (define-public python-vedo range of functionalities for working with three-dimensional meshes and point clouds. It can also be used to generate high quality two-dimensional renderings such as scatter plots and histograms. -@code{vedo} is based on @code{vtk} and @code{numpy}, with no other -dependencies.") +@code{vedo} is based on @code{vtk} and @code{numpy}.") ;; vedo is released under the Expat license. Included fonts are ;; covered by the OFL license and textures by the CC0 license. ;; The earth images are in the public domain.