From d56a29edb7e5ab24ae04869aea68befa4625c11d Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 12 Aug 2021 19:03:25 +0100 Subject: gnu: python-pygmsh: Update snippet for Gmsh > 4.7.0. The old field option name is not needed after commit 78595fe3650057f258109c6599f4bae1d0e72e (Gmsh 4.8.4). * gnu/packages/simulation.scm (python-pygmsh)[source]: Remove option name substitution. --- gnu/packages/simulation.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/simulation.scm') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 96928dfa07..929399c86c 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -863,13 +863,6 @@ (define-public python-pygmsh ;; The extra reference is unnecessary and is removed. (substitute* "setup.cfg" (("^[[:blank:]]+setuptools>=42\n") "")) - ;; FIXME: gmsh version 4.7.0 introduces new field option - ;; names. See gmsh commit 6eab8028. pygmsh needs to use - ;; one of the old option names for compatibility with gmsh - ;; version 4.6.0. - (with-directory-excursion "pygmsh/common" - (substitute* "size_field.py" - (("NumPointsPerCurve") "NNodesByEdge"))) #t)))) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From 74b82ecd0eca64fe11728e286cabbd4da07b8391 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 13 Aug 2021 01:19:30 +0100 Subject: gnu: python-pygmsh: Change source to 'git-fetch'. * gnu/packages/simulation.scm (python-pygmsh)[source]: Change to 'git-fetch'. --- gnu/packages/simulation.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/simulation.scm') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 929399c86c..7a313621d1 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -846,11 +846,14 @@ (define-public python-pygmsh (version "7.1.9") (source (origin - (method url-fetch) - (uri (pypi-uri "pygmsh" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nschloe/pygmsh") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1q7nr0cq581wlif537y6awj7vz9jywxg14c8znmsx5ip8x24754j")) + "1lq16v31sifd9n1bb8yxnp3vhafrxz1rvydk9hh1add96fbjgj29")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2caf9eafb6f4703d8f1af42123093f4a7f7a32ce Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 13 Aug 2021 09:22:32 +0100 Subject: gnu: python-pygmesh: Update to 7.1.10. * gnu/packages/simulation.scm (python-pygmah): Update to 7.1.10. [arguments]<#:phases>: Tests have moved to the 'tests' directory. The test_readme.py file has been removed. --- gnu/packages/simulation.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/simulation.scm') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 7a313621d1..a2c65b73c8 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -843,7 +843,7 @@ (define-public python-meshio (define-public python-pygmsh (package (name "python-pygmsh") - (version "7.1.9") + (version "7.1.10") (source (origin (method git-fetch) @@ -853,7 +853,7 @@ (define-public python-pygmsh (file-name (git-file-name name version)) (sha256 (base32 - "1lq16v31sifd9n1bb8yxnp3vhafrxz1rvydk9hh1add96fbjgj29")) + "03a949nl99ny9h0ni8lqgaljgkgicd305ls6zy1vkwgfa4mzsgqh")) (modules '((guix build utils))) (snippet '(begin @@ -883,10 +883,7 @@ (define-public python-pygmsh (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? (add-installed-pythonpath inputs outputs) - ;; The readme test is skipped. It requires the exdown - ;; module which is not available. - (invoke "python" "-m" "pytest" "-v" "test" - "--ignore" "test/test_readme.py")) + (invoke "python" "-m" "pytest" "-v" "tests")) #t))))) (home-page "https://github.com/nschloe/pygmsh") (synopsis "Python frontend for Gmsh") -- cgit v1.2.3 From d6c2fc37292f5bd75a7fd26ae4bccf649175c00e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 23 Aug 2021 12:33:20 +0100 Subject: gnu: python-pygmsh: Update to 7.1.11. *gnu/packages/simulation.scm (python-pygmsh): Update to 7.1.11. [source](snippet): Re-phrase comment. --- gnu/packages/simulation.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/simulation.scm') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a2c65b73c8..23580322bb 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -843,27 +843,27 @@ (define-public python-meshio (define-public python-pygmsh (package (name "python-pygmsh") - (version "7.1.10") + (version "7.1.11") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/nschloe/pygmsh") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "03a949nl99ny9h0ni8lqgaljgkgicd305ls6zy1vkwgfa4mzsgqh")) + "0g4yllmxks7yb50vild5xi1cma0yl16vsq6rfvdwmqaj4hwxcabk")) (modules '((guix build utils))) (snippet '(begin (let ((file (open-file "setup.py" "a"))) (display "from setuptools import setup\nsetup()" file) (close-port file)) - ;; setuptools is supplied by the build system. An extra - ;; reference in the original configuration file triggers - ;; an attempt to download the package again. This fails. - ;; The extra reference is unnecessary and is removed. + ;; A reference to setuptools in the configuration file + ;; triggers an attempt to download the package from pypi. + ;; The reference is not needed since the package is + ;; provided by the build system. (substitute* "setup.cfg" (("^[[:blank:]]+setuptools>=42\n") "")) #t)))) -- cgit v1.2.3