From 21dc181918c9613ef69027b85db63362f45509e0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 13 Dec 2025 16:01:28 +0000 Subject: [PATCH] gnu: python-tables: Update to 3.10.2-0.aad9079. * gnu/packages/python-xyz.scm (python-tables): Update to aad9079c80ce3ae7f385d00af760d171dcc10535 commit. [source]: Switch to git-fetch providing comparability with python-numexpr. : Delete "hdf5-blosc" git submodule. [phases]{pre-build}: Substitute "hdf5-blosc" source path. [inputs]: Add hdf5-blosc. Change-Id: I7624af17709e150cea4f316cc4fd7f1786c3df1c Signed-off-by: Rutherther --- gnu/packages/python-xyz.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1fc6c83e1175c0e4504296dd636fd992770e6c02..d301e30c2cbc722e06516c6ee8d64e35a15796ba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -37111,18 +37111,25 @@ as possible in order to be comprehensible and easily extensible.") (define-public python-tables (package (name "python-tables") - (version "3.10.2") + ;; XXX: Compatability fix for numexpr 2.13.0, see: + ;; . + (properties '((commit . "aad9079c80ce3ae7f385d00af760d171dcc10535") + (revision . "0"))) + (version (git-version "3.10.2" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) (source (origin - (method url-fetch) - (uri (pypi-uri "tables" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/PyTables/PyTables") + (commit (assoc-ref properties 'commit)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0469jrkmp0qv8cmlqkizm3b8imyc97mk9pfn66ldpyl6f4m82i15")) + (base32 "0gnqj1gj6dnr167pacmynvghw8bwwll6nlz843rm95r07zi6blrm")) (snippet '(begin (use-modules (guix build utils)) - ;; TODO: Unbundle. - ;; (delete-file-recursively "hdf5-blosc") + (delete-file-recursively "hdf5-blosc") (delete-file-recursively "c-blosc"))))) (build-system pyproject-build-system) (arguments @@ -37145,6 +37152,10 @@ as possible in order to be comprehensible and easily extensible.") "\",\n" m))))) (add-before 'build 'pre-build (lambda _ + (substitute* "setup.py" + (("hdf5-blosc/src") + (format #f "~a/src" + #$(package-source (this-package-input "hdf5-blosc"))))) (invoke "make" "distclean") ;Regenerate C code with Cython (setenv "BLOSC2_DIR" #$(this-package-input "cblosc2")) (setenv "BLOSC_DIR" #$(this-package-input "c-blosc")) @@ -37177,6 +37188,7 @@ as possible in order to be comprehensible and easily extensible.") c-blosc c-blosc2 hdf5 + hdf5-blosc lzo)) (propagated-inputs (list python-blosc2