branch master updated: gnu: python-dolfin-adjoint: Fix build.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

andreas pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 46f36ac969 gnu: python-dolfin-adjoint: Fix build.
46f36ac969 is described below

commit 46f36ac9696b5ac0ac874ebc8bb053b499d883ac
Author: Felix Gruber <felgru@posteo.net>
AuthorDate: Sat Jun 24 15:01:27 2023 +0000

    gnu: python-dolfin-adjoint: Fix build.
    
    * gnu/packages/simulation.scm (python-dolfin-adjoint): Fix build.
      [arguments]: Disable failing test_read_checkpoint in 'check phase.
      Remove broken 'sanity-check phase.
    
    Signed-off-by: Andreas Enge <andreas@enge.fr>
---
 gnu/packages/simulation.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index db73812a41..b2fb123815 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -1243,10 +1243,17 @@ command-line utility for mesh optimisation.")
              (when tests?
                (add-installed-pythonpath inputs outputs)
                (setenv "HOME" (getcwd))
-               (and (invoke "py.test" "-v" "tests/fenics_adjoint")
+               (and (invoke "py.test" "-v" "tests/fenics_adjoint"
+                            "-k" "not test_read_checkpoint")
                     (invoke "py.test" "-v" "tests/migration")
                     (invoke "py.test" "-v" "tests/pyadjoint")))
-             #t)))))
+             #t))
+         ;; Remove 'sanity-check, because it tries to import
+         ;; 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))))
     (home-page "https://www.dolfin-adjoint.org";)
     (synopsis "Automatic differentiation library")
     (description "@code{python-dolfin-adjoint} is a solver of