From patchwork Fri Apr 22 11:53:08 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: 1805 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 59A4327BBEA; Fri, 22 Apr 2022 13:45:42 +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 2AC0D27BBE9 for ; Fri, 22 Apr 2022 13:45:42 +0100 (BST) Received: from localhost ([::1]:42668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhsfN-0004Md-9m for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 08:45:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrrO-00022L-Gf for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhrrO-0005JI-7F for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhrrO-0007Z0-62 for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v2 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 11:54: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.165062840328938 (code B ref 54869); Fri, 22 Apr 2022 11:54:02 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 11:53:23 +0000 Received: from localhost ([127.0.0.1]:51774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqk-0007Wg-TY for submit@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:23 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:42087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqj-0007W8-Df for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:21 -0400 Date: Fri, 22 Apr 2022 11:53:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650628395; bh=o2f4XfrY+uuhnZIIUGf0HLR71OZ1gAIU0C5r3KtWUuA=; 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=NNKuN4QENqgMz+k1SNEfkdnT9CSCqS0t03cPVRSsswLGK2Q984+VbB+dqLEJ+l+8V KoCbE0Bw/yv/6Dh5Y0NeZbEwgJuvuICsx09oUx2Ku+YIJ6CNARXtA/ZhOnBUSsJ1A1 0g2zrSvuaKNLhmE3gu305g95+NYqMfJ2CPjUQKzG2df14aoAf0jht8Otkg4lWDVH+Q +Wq8J7EkksEO+fessxvqCNWZB/nWI76/XYMd+KviGs0hVUhk1p8xYUUI5bBWct8SaO VF12zmBfjVvhpXc9uEoEd27645LB0WI4AtITbiDwbrpJJZ8qflGpPzkI+eSiRNtMJM /7buKCoFvCTKg== From: "Paul A. Patience" Message-ID: <20220422115258.63649-2-paul@apatience.com> In-Reply-To: <20220422115258.63649-1-paul@apatience.com> References: <20220422115258.63649-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)[arguments]: Adjust custom 'check' phase to honor the #:tests? flag. --- gnu/packages/simulation.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.35.1 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 3f2d8e136d..aebb6be15e 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -549,12 +549,13 @@ (define-public fenics-dolfin ")\n") port))) #t)) (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? + (and (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 11:53:11 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: 1809 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 26F7127BBEA; Fri, 22 Apr 2022 13:51:02 +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 E3DDB27BBE9 for ; Fri, 22 Apr 2022 13:51:01 +0100 (BST) Received: from localhost ([::1]:52398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhskX-0004Nu-05 for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 08:51:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrrO-00023g-Tv for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhrrO-0005JU-L4 for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhrrO-0007Z9-KB for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v2 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 11:54: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.165062840528947 (code B ref 54869); Fri, 22 Apr 2022 11:54:02 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 11:53:25 +0000 Received: from localhost ([127.0.0.1]:51776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqn-0007Wp-6G for submit@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:25 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:12841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqk-0007W9-41 for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:22 -0400 Date: Fri, 22 Apr 2022 11:53:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650628396; bh=iGhOR2/z0QqlI2pfplTQdsRDHas+rMjPxKEdw7RmeYM=; 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=VIdKm8wR9K3S+x+bTB9BowA0i78b5/Jql/G+5x1+t9RvIvwiNQvUGDUAeAK1gLBhR KKKmVr5Xac1TZRIJZeGIx6q7Uu2Hsk3wSYfd2frb00vL+nEthntPpa/FQA+XIddCMe Kqgd3ZLe4P99nvyFiWy5H5b3DiNdvHsYtFmDXaNk+RAfhx61ARriANDoCGMmwRuMsz iE1mAkv4uoKG7fiea4FUsDArxi+Ld1lSmb3ZFJqN2TK8dTV5GprGvxANTwxhbsauTG q7Zr6h2V3AKKnuLQJpqN0H0CJvTBtE05LhWAMIZZWKyivMvzDyZF4AAeeK640f9+Kx UPDfy5Jaj3AJA== From: "Paul A. Patience" Message-ID: <20220422115258.63649-3-paul@apatience.com> In-Reply-To: <20220422115258.63649-1-paul@apatience.com> References: <20220422115258.63649-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 aebb6be15e..3260841608 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -660,17 +660,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 11:53:14 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: 1806 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 222A527BBEA; Fri, 22 Apr 2022 13:45:56 +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 ECA9827BBE9 for ; Fri, 22 Apr 2022 13:45:55 +0100 (BST) Received: from localhost ([::1]:43392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhsfb-0004wW-2v for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 08:45:55 -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 1nhrrP-000252-Av for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhrrP-0005Ji-1g for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhrrP-0007ZH-10 for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v2 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 11:54: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.165062840828973 (code B ref 54869); Fri, 22 Apr 2022 11:54:02 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 11:53:28 +0000 Received: from localhost ([127.0.0.1]:51782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqq-0007XB-DQ for submit@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:28 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:64167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqo-0007WS-Oi for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:27 -0400 Date: Fri, 22 Apr 2022 11:53:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650628400; bh=KpDzeNWOr9fzo1SN/9ZzY5dFGO5KscG1+DwteFz+kmE=; 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=E4yX+vjgfkSCWAh6YTIwTkk38AajTYp1GdP7eoUNYxw+uGnUL9dfBVe9Wt9MpIFgZ /8ObaYltIqWwRuE9ttBxwE/ZALDIf6hHuremFDr2LZ7zHciOp3ZScgulHYVzMS79Q1 fg1xAIRcGay7998QuWQpaTypk5Df7rcUh8Vlg83QjpY/hFs4FW3RAVws08/1N5Jheo Rlvdtfpp16Gae5rpvrn9Z96zcOI5mIlVu7Nba7QD4OdUalaBcfbhU5JDb7bcVqyL3u L8f0FlggR2FBXWTJfInVY27hXkQn7BpMRdNVygAT51Sn0SWsN46aPfFSLHsmKgojTQ B2G/TETFSqMkQ== From: "Paul A. Patience" Message-ID: <20220422115258.63649-4-paul@apatience.com> In-Reply-To: <20220422115258.63649-1-paul@apatience.com> References: <20220422115258.63649-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 3260841608..b0f6046022 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -610,6 +610,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 11:53:17 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: 1811 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 372AD27BBEA; Fri, 22 Apr 2022 13:52:34 +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 022BB27BBE9 for ; Fri, 22 Apr 2022 13:52:34 +0100 (BST) Received: from localhost ([::1]:55768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhsm1-0008AF-52 for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 08:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrrP-00026u-P6 for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhrrP-0005Jt-EO for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhrrP-0007ZO-D4 for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v2 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 11:54: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.165062841128982 (code B ref 54869); Fri, 22 Apr 2022 11:54:03 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 11:53:31 +0000 Received: from localhost ([127.0.0.1]:51784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqs-0007XO-Pa for submit@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:30 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:51827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqp-0007Wb-PJ for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:28 -0400 Date: Fri, 22 Apr 2022 11:53:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650628402; 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=Hf4K7Nz5fK6zg1SO0AAqlwLWa+RaMese3hwcDrDkrSap4RBxrOepYUttlslLSm7Dn nXwMIXrbM/RwFNIi22r+J7LYpFm5GAAjzZ0tVov+WhVDaqQMXFeLwlQklD1WQyYM/d LBApI+fTCzA9+NljXQFpRACTgeoCKfX+3hQNWsV4LQ4KtkZWflItfIKHa585HO+yMq m05XVQyBnwVtUjSrPhYY0QgGZ2S77+s5F/SEorQ7Uyo5isCyy+/q11DUZUi2f1DoHx cNG+qEJAWpS3FALZ52SJnbSrOs4gRfXcEVPaZHdDSmVfMDwU2JhHV3dZwKcWsJZNZq Zcx75BOeZXENw== From: "Paul A. Patience" Message-ID: <20220422115258.63649-5-paul@apatience.com> In-Reply-To: <20220422115258.63649-1-paul@apatience.com> References: <20220422115258.63649-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 11:53:20 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: 1807 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 11B8127BBE9; Fri, 22 Apr 2022 13:46: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.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 CA58D27BBE9 for ; Fri, 22 Apr 2022 13:46:11 +0100 (BST) Received: from localhost ([::1]:44132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhsfq-0005Y5-O3 for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 08:46:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrrQ-00029s-KU for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhrrQ-0005KG-9P for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhrrQ-0007Zd-8Q for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v2 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 11:54: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.165062841529011 (code B ref 54869); Fri, 22 Apr 2022 11:54:04 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 11:53:35 +0000 Received: from localhost ([127.0.0.1]:51792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqx-0007Xm-Cf for submit@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:35 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:17882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqu-0007Wz-Gr for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:32 -0400 Date: Fri, 22 Apr 2022 11:53:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650628406; 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=P6ZVAVCWGJBxdG3fr3Wsyv+BOjkU1z4j1UTD2U0Lk05OPL2izHcOjHeIUatXLKBVz MW03Eo6LfRoxJdt0OE/0Ag1096YZ3DrbBeI87snHwuVAIgwci//J3AbDbHBCjrNexA lHRNOxR3eJugfRoNKWJsu/zwAH12fEzQlQm+6KIdfcdWygnvaHjKgioJOz6l2mBson TxjkBC18cBKpUYn9NFcWS5DLVtSTN1Wx4LgH3uR228CFgYbJwv/849LXkaKiN6lcQ2 gnzW4UwaKXyBSBpXgRmKknT28ALLffrljFeukQ9P/aH7MTEd1sUn5kLcmOyOEJXPON tWK+KgM9QbW2g== From: "Paul A. Patience" Message-ID: <20220422115258.63649-6-paul@apatience.com> In-Reply-To: <20220422115258.63649-1-paul@apatience.com> References: <20220422115258.63649-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 11:53:23 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: 1810 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 A2C4F27BBEA; Fri, 22 Apr 2022 13:51:35 +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 6BD2127BBE9 for ; Fri, 22 Apr 2022 13:51:35 +0100 (BST) Received: from localhost ([::1]:53286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhsl4-0005E8-IR for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 08:51:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrrQ-00028K-5d for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhrrP-0005K7-SS for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhrrP-0007ZW-RF for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v2 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 11:54: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.165062841529005 (code B ref 54869); Fri, 22 Apr 2022 11:54:03 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 11:53:35 +0000 Received: from localhost ([127.0.0.1]:51790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqx-0007Xk-10 for submit@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:35 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:29698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrqs-0007Wx-UD for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:31 -0400 Date: Fri, 22 Apr 2022 11:53:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650628405; bh=tr1L2eLKA65s3YzSRsc0+JJ8IBWJhFrS/V12ySguSkQ=; 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=V/BW0MN41OygUmrzERbjxgwyN5KB8U67PhhxLYKEFzUhXf8sze301ch6Zkeqns0px NT9ojyNuZFvDwsfi5jDArwUaM5OGHmJN/VmpQwLzd8Hb97nalGmdEz3rTHfqJUyq1g 8PQV4b4VyCX2oqu7L2wyj1pGhiKt01Gz+CtfNt5YlszjCja17Fqbi/TuV+eW+Y91qB SvBdgUEBwSsT8FFnf0r1eKt0z/pzwa3ZNW95pnF2sqGfFoVlPHf6I2kWbrPnL4BSPl PoilydcSb61lT6sLcGDtlPxFRqoetvsqH58RQYp2KLu9PWPCN/UdGTeRpjIqbyOOGB VVZ5hkbSbvKsQ== From: "Paul A. Patience" Message-ID: <20220422115258.63649-7-paul@apatience.com> In-Reply-To: <20220422115258.63649-1-paul@apatience.com> References: <20220422115258.63649-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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.35.1 diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 3afaa0efc2..d0fca49aaf 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -884,7 +884,13 @@ (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'}) + ;; + ;; Probably it cannot find VTK because it isn't a Python library. + (delete 'sanity-check)))) (inputs ; for the check phase (list fenics python-matplotlib From patchwork Fri Apr 22 11:53:32 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: 1808 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 C0C1627BBEA; Fri, 22 Apr 2022 13:46:43 +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 7976427BBE9 for ; Fri, 22 Apr 2022 13:46:43 +0100 (BST) Received: from localhost ([::1]:44842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhsgM-00068L-KD for patchwork@mira.cbaines.net; Fri, 22 Apr 2022 08:46:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhrrR-0002BJ-0B for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhrrQ-0005KP-Lx for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhrrQ-0007Zm-LN for guix-patches@gnu.org; Fri, 22 Apr 2022 07:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54869] [PATCH v2 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 11:54: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.165062842829039 (code B ref 54869); Fri, 22 Apr 2022 11:54:04 +0000 Received: (at 54869) by debbugs.gnu.org; 22 Apr 2022 11:53:48 +0000 Received: from localhost ([127.0.0.1]:51796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrr9-0007YI-M1 for submit@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:47 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:43194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhrr7-0007Y3-Cp for 54869@debbugs.gnu.org; Fri, 22 Apr 2022 07:53:46 -0400 Date: Fri, 22 Apr 2022 11:53:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1650628418; bh=EaAxyR+H1bm3Pne2AfVyv/6v9kefxDueCZMxiMS//dY=; 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=Ywe4MKwliqNZrZ8tVEe2qn/1UVIBemrPNVxGB1pL06hfAGaIh8QjvlY3fkVeilXIA hMgDwy16CJngYbfjEPghyOS504v2gSkNEqkYaE/4FoSzdHHeiJSo+Zl5yl9Xve1y0v 2OxWmUeHuMFHQQJzforxpFsLpO98oCKa3SAI2PrKfUYRM7yt+uTBHO0xDh2Q7hZUtc 75779QJYo2XdDghWynx/IknauHqYDKAcynalPlWXdwe/ByPbnmc8oxp4Obp4AIUlSb m8nnr14DegBbUwJGTBnZgUWGKf3MbMvN14+aXwOl/5wVEJVWEPJIp005SNiimgkWjL xR6ELEY2WOYvQ== From: "Paul A. Patience" Message-ID: <20220422115258.63649-8-paul@apatience.com> In-Reply-To: <20220422115258.63649-1-paul@apatience.com> References: <20220422115258.63649-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 d0fca49aaf..b1fc94cecc 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,18 +895,18 @@ (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'}) ;; ;; Probably it cannot find VTK because it isn't a Python library. (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 @@ -909,8 +917,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.