janneke pushed a commit to branch core-packages-team-old in repository guix.
commit 0354a1656f40d51ec6dc007a2bbc17bf7f55cbf4 Author: Janneke Nieuwenhuizen <[email protected]> AuthorDate: Sun Dec 15 11:22:51 2024 +0100 squash! gnu: python-numpy: Update to 1.26.4 and fix build with gcc-14. Change-Id: I8fcd029f55cf5cf93871f7a6f0917410ab356e5b --- gnu/packages/python-xyz.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e7d0bede9a..0ccffa8280 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8812,7 +8812,7 @@ programming language and the extended Cython programming language. It makes writing C extensions for Python as easy as Python itself.") (license license:asl2.0))) -;; Needed for scipy +;; Needed for scipy and numpy (define-public python-cython-0.29.35 (package (inherit python-cython) @@ -8901,7 +8901,7 @@ writing C extensions for Python as easy as Python itself.") (base32 "0410j6jfz1yzm5s0v0yrc1j0q6ih4322357and7arr0jxnlsn0ia")) (patches (search-patches "python-numpy-gcc-14.patch")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:modules '((guix build utils) @@ -8979,11 +8979,11 @@ include_dirs = ~:*~a/include~%" #$@(if (or (target-x86?) (target-arm32?)) `(" and not test_identityless_reduction_huge_array" " and not (TestKind and test_all)") - '()) + '()) ;; This test fails when building from aarch64-linux. #$@(if (target-arm32?) - `(" and not test_features") - '()) + `(" and not test_features") + '()) ;; These tests seem to fail on machines without ;; an FPU is still under investigation upstream. ;; https://github.com/numpy/numpy/issues/20635 @@ -9008,7 +9008,7 @@ include_dirs = ~:*~a/include~%" (native-inputs (list meson-python pkg-config - python-cython ;; overwrite Cython from meson-python + python-cython-0.29.35 ;overwrite Cython from meson-python python-hypothesis python-mypy python-pytest @@ -9016,7 +9016,10 @@ include_dirs = ~:*~a/include~%" python-setuptools python-typing-extensions python-wheel - gcc-14 ;fevn.h c[++] include must precede fortran's + ;; XXX: Avoid to: 'fenv_t' has not been declared in '::' 58 | using ::fenv_t; + ;; See <https://github.com/numpy/numpy/issues/21075#issuecomment-1047976197>, + ;; <https://github.com/numpy/numpy/issues/24318>. + gcc ;fevn.h c[++] include must precede fortran's gfortran)) (inputs (list bash openblas)) (home-page "https://numpy.org";)
