branch core-updates updated: gnu: python-cython: The i686 python2 workaround is needed for 32-bit ARM too.

[guix-commits]

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

mbakke pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new d523eb5  gnu: python-cython: The i686 python2 workaround is needed for 
32-bit ARM too.
d523eb5 is described below

commit d523eb5c9c2659cbbaf4eeef3691234ae527ee6a
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Apr 9 00:53:28 2020 +0200

    gnu: python-cython: The i686 python2 workaround is needed for 32-bit ARM 
too.
    
    * gnu/packages/python-xyz.scm (python-cython)[arguments]: In the check 
phase,
    disable parallel test execution for all 32-bit systems.
    * gnu/packages/python-xyz.scm (python2-cython)[arguments]: Remove similar 
i686 workaround.
---
 gnu/packages/python-xyz.scm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5e56a2b..b26399c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3894,7 +3894,13 @@ provides additional functionality on the produced 
Mallard documents.")
              (setenv "CFLAGS" "-O0")
 
              (invoke "python" "runtests.py" "-vv"
-                     "-j" (number->string (parallel-job-count))))))))
+                     "-j" (number->string (parallel-job-count))
+                     ;; XXX: On 32-bit architectures, running the parallel 
tests
+                     ;; fails on many-core systems, see
+                     ;; <https://github.com/cython/cython/issues/2807>.
+                     ,@(if (not (target-64bit?))
+                           '("-x" "run.parallel")
+                           '())))))))
     (home-page "https://cython.org/";)
     (synopsis "C extensions for Python")
     (description "Cython is an optimising static compiler for both the Python
@@ -3914,18 +3920,6 @@ writing C extensions for Python as easy as Python 
itself.")
        (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           `(modify-phases ,phases
-             ;; XXX: On i686-linux, running the parallel tests fails on 
many-core
-             ;; systems, see <https://github.com/cython/cython/issues/2807>.
-             ;; TODO: Move this logic to the regular check phase in a future
-             ;; rebuild cycle.
-             ,@(if (string-prefix? "i686" (%current-system))
-                   '((replace 'check
-                       (lambda _
-                         (setenv "CFLAGS" "-O0")
-                         (invoke "python" "runtests.py" "-vv"
-                                 "-j" (number->string (parallel-job-count))
-                                 "-x" "run.parallel"))))
-                   '())
              (add-before 'check 'adjust-test_embed
                (lambda _
                  (substitute* "runtests.py"