me
/
guix
Archived
1
0
Fork 0
Code

gnu: python-dolfin-adjoint: Swap to pyproject-build-system. 

* gnu/packages/simulation.scm (python-dolfin-adjoint) [source]: Remove
trailing #t from snippet.
[build-system]: Swap to pyproject-build-system.
[arguments]: Apply G-expressions. <#:phases>: Swap back to defaul 'check
phase.

python-dolfin-adjoint

Change-Id: Idf100b718b44d9d6695e598c434fbbac55a38845
Sharlatan Hellseher 2024-07-01 21:46:21 +01:00
parent 9da142540e
commit 72024ae490
No known key found for this signature in database
GPG Key ID: 76D727BFF62CD2B5
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gnu/packages/simulation.scm
View File

@ -1187,8 +1187,7 @@ command-line utility for mesh optimisation.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn"))
"0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1201,39 +1200,33 @@ command-line utility for mesh optimisation.")
(("\\\"mpirun\\\", \\\"-n\\\", \\\"2\\\", ") ""))) (("\\\"mpirun\\\", \\\"-n\\\", \\\"2\\\", ") "")))
;; Result files are regenerated in the check phase. ;; Result files are regenerated in the check phase.
(delete-file-recursively (delete-file-recursively
"tests/migration/viscoelasticity/test-results") "tests/migration/viscoelasticity/test-results")))))
#t)))) (build-system pyproject-build-system)
(build-system python-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:test-flags
(add-after 'build 'mpi-setup #~(list "tests/fenics_adjoint"
,%openmpi-setup) "tests/migration"
(add-after 'install 'install-doc "tests/pyadjoint"
(lambda* (#:key outputs #:allow-other-keys) "-k" "not test_read_checkpoint")
(let* ((doc (string-append (assoc-ref outputs "out") #:phases
"/share/doc/" ,name "-" #~(modify-phases %standard-phases
,version)) (add-after 'build 'mpi-setup #$%openmpi-setup)
(examples (string-append doc "/examples"))) (add-before 'check 'set-environment-variables
(mkdir-p examples) (lambda _
(copy-recursively "examples" examples)) (setenv "HOME" "/tmp")))
#t)) (add-after 'install 'install-doc
(replace 'check (lambda _
(lambda* (#:key inputs outputs tests? #:allow-other-keys) (let* ((doc (string-append #$output "/share/doc/" #$name "-" #$version))
(when tests? (examples (string-append doc "/examples")))
(add-installed-pythonpath inputs outputs) (mkdir-p examples)
(setenv "HOME" (getcwd)) (copy-recursively "examples" examples))))
(and (invoke "py.test" "-v" "tests/fenics_adjoint" ;; Remove 'sanity-check, because it tries to import
"-k" "not test_read_checkpoint") ;; firedrake_adjoint after importing fenics_adjoint.
(invoke "py.test" "-v" "tests/migration") ;; Both load a module named 'backend' and firedrake_adjoint
(invoke "py.test" "-v" "tests/pyadjoint"))) ;; fails with an ImportError if it sees that the backend module
#t)) ;; has already been loaded.
;; Remove 'sanity-check, because it tries to import (delete 'sanity-check))))
;; firedrake_adjoint after importing fenics_adjoint.
;; Both load a module named 'backend' and firedrake_adjoint
;; fails with an ImportError if it sees that the backend module
;; has already been loaded.
(delete 'sanity-check))))
(inputs (inputs
(list fenics openmpi pybind11)) (list fenics openmpi pybind11))
(native-inputs (native-inputs