guix_mirror_bot pushed a commit to branch python-team
in repository guix.
commit 6b4dc9b3b1111b402243b6b486db498f240a0b82
Author: Hugo Buddelmeijer <[email protected]>
AuthorDate: Sun Jul 12 23:28:52 2026 +0200
gnu: python-pyhalo: Fix build with NumPy 2.4.6.
* gnu/packages/astronomy.scm (python-pyhalo):
[phases]{fix-trapz}: New phase.
Relates-to: guix/guix!9885
Signed-off-by: Sharlatan Hellseher <[email protected]>
---
gnu/packages/astronomy.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 6a55aba048..edd074e3b0 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -8579,10 +8579,12 @@ using the PyCPL Python API.")
(define-public python-pyhalo
(package
(name "python-pyhalo")
+ ;; 1.4.7 only works with a specific lenstronomy-fork
(version "1.4.6")
(source
(origin
(method url-fetch)
+ ;; 1.4.6 is not tagged so cannot use git-fetch; 1.4.7 is though.
(uri (pypi-uri "pyhalo" version))
(sha256
(base32 "0gwlcsgd4pd9smy8wx1bqk77bmd475plmqshj7r7czm8vh0w9lqr"))))
@@ -8597,6 +8599,18 @@ using the PyCPL Python API.")
(lambda _
(substitute* "setup.py"
((".pyHalo=pyHalo.cli:main.*") ""))))
+ (add-after 'unpack 'fix-trapz
+ (lambda _
+ (substitute*
+ (list "pyHalo/Halos/HaloModels/TNFW.py"
+ "pyHalo/Halos/tidal_truncation.py")
+ ;; prevent TypeError: only 0-dimensional arrays can be
converted
+ ;; to Python scalars
+ (("float\\(") "np.ndarray.item("))
+ (substitute*
+ (find-files "." "\\.py$")
+ ;; trapz is removed in NumPy 2.4.6, and is now called
trapezoid.
+ (("np.trapz\\(") "np.trapezoid("))))
(add-before 'check 'pre-check
(lambda _
;; RuntimeError: cannot cache function 'rotate': no locator
