[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
74/242: gnu: python-scipy: Move input fields below arguments field.
From: |
guix-commits |
Subject: |
74/242: gnu: python-scipy: Move input fields below arguments field. |
Date: |
Wed, 11 May 2022 18:02:54 -0400 (EDT) |
apteryx pushed a commit to branch wip-ipython-polyglossia
in repository guix.
commit bf31f2ed724705d94c47dba4f7bd055466e90ac3
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Apr 6 20:53:31 2022 -0400
gnu: python-scipy: Move input fields below arguments field.
* gnu/packages/python-science.scm (python-scipy): Move inputs fields below
the
arguments field.
[phases]: Use gexp.
{configure-openblas}: Use this-package-input.
{check}: Remove extraneous 'add-installed-pythonpath' call.
{install-doc}: Adjust accordingly.
---
gnu/packages/python-science.scm | 155 ++++++++++++++++++++--------------------
1 file changed, 77 insertions(+), 78 deletions(-)
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 2eb3b344c7..d192543f5c 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2016, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016-2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
@@ -80,49 +80,36 @@
(uri (pypi-uri "scipy" version))
(sha256
(base32 "1gxsnw6viz2j3sm8ak2a8l7fcn4b2zm3kzfm8w57xxyyrzx7an5b"))))
- (build-system python-build-system)
- (propagated-inputs
- (list python-numpy python-matplotlib python-pyparsing))
- (inputs
- (list openblas pybind11))
- (native-inputs
- (list python-cython
- python-pydata-sphinx-theme
- python-pytest
- python-sphinx
- python-sphinx-panels
- python-numpydoc
- gfortran
- perl
- which))
(outputs '("out" "doc"))
+ (build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-pythran
- (lambda _
- (setenv "SCIPY_USE_PYTHRAN" "0")))
- (add-before 'build 'change-home-dir
- (lambda _
- ;; Change from /homeless-shelter to /tmp for write permission.
- (setenv "HOME" "/tmp")))
- (add-after 'unpack 'disable-broken-tests
- (lambda _
- (substitute* "scipy/sparse/linalg/dsolve/tests/test_linsolve.py"
- (("^( +)def test_threads_parallel\\(self\\):" m indent)
- (string-append indent
- "@pytest.mark.skip(reason=\"Disabled by
Guix\")\n"
- m)))
- (substitute*
"scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py"
- (("^def test_parallel_threads\\(\\):" m)
- (string-append "@pytest.mark.skip(reason=\"Disabled by
Guix\")\n"
- m)))))
- (add-before 'build 'configure-openblas
- (lambda* (#:key inputs #:allow-other-keys)
- (call-with-output-file "site.cfg"
- (lambda (port)
- (format port
- "[blas]
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-pythran
+ (lambda _
+ (setenv "SCIPY_USE_PYTHRAN" "0")))
+ (add-before 'build 'change-home-dir
+ (lambda _
+ ;; Change from /homeless-shelter to /tmp for write permission.
+ (setenv "HOME" "/tmp")))
+ (add-after 'unpack 'disable-broken-tests
+ (lambda _
+ (substitute* "scipy/sparse/linalg/dsolve/tests/test_linsolve.py"
+ (("^( +)def test_threads_parallel\\(self\\):" m indent)
+ (string-append indent
+ "@pytest.mark.skip(reason=\"Disabled by
Guix\")\n"
+ m)))
+ (substitute*
"scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py"
+ (("^def test_parallel_threads\\(\\):" m)
+ (string-append "@pytest.mark.skip(reason=\"Disabled by
Guix\")\n"
+ m)))))
+ (add-before 'build 'configure-openblas
+ (lambda _
+ (call-with-output-file "site.cfg"
+ (lambda (port)
+ (format port
+ "[blas]
libraries = openblas
library_dirs = ~a/lib
include_dirs = ~a/include
@@ -132,42 +119,54 @@ include_dirs = ~a/include
library_dirs = ~a/lib
atlas_libs = openblas
"
- (assoc-ref inputs "openblas")
- (assoc-ref inputs "openblas")
- (assoc-ref inputs "openblas"))))))
- (add-after 'install 'install-doc
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((data (string-append (assoc-ref outputs "doc") "/share"))
- (doc (string-append data "/doc/" ,name "-" ,version))
- (html (string-append doc "/html"))
- (pyver ,(string-append "PYVER=" (version-major+minor
- (package-version
python))))
- ;; By default it tries to run sphinx-build through the
Python
- ;; interpreter which won't work with our shell wrapper.
- (sphinxbuild "SPHINXBUILD=LANG=C sphinx-build"))
- ;; Make installed package available for building the
- ;; documentation
- (add-installed-pythonpath inputs outputs)
- (with-directory-excursion "doc"
- ;; Fix generation of images for mathematical expressions.
- (substitute* (find-files "source" "conf\\.py")
- (("pngmath_use_preview = True")
- "pngmath_use_preview = False"))
- (mkdir-p html)
- (invoke "make" "html" pyver sphinxbuild)
- (with-directory-excursion "build/html"
- (for-each (lambda (file)
- (let* ((dir (dirname file))
- (tgt-dir (string-append html "/" dir)))
- (install-file file html)))
- (find-files ".")))))))
- (replace 'check
- (lambda* (#:key tests? inputs outputs #:allow-other-keys)
- (when tests?
- (add-installed-pythonpath inputs outputs)
- (with-directory-excursion "/tmp"
- (invoke "python" "-c"
- "import scipy; scipy.test(verbose=2)"))))))))
+ #$(this-package-input "openblas")
+ #$(this-package-input "openblas")
+ #$(this-package-input "openblas"))))))
+ (add-after 'install 'install-doc
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((data (string-append (assoc-ref outputs "doc") "/share"))
+ (doc (string-append data "/doc/" #$name "-" #$version))
+ (html (string-append doc "/html"))
+ (pyver (string-append "PYVER="
+ #$(version-major+minor
+ (package-version python))))
+ ;; By default it tries to run sphinx-build through the
Python
+ ;; interpreter which won't work with our shell wrapper.
+ (sphinxbuild "SPHINXBUILD=LANG=C sphinx-build"))
+ ;; Make installed package available for building the
+ ;; documentation
+ (add-installed-pythonpath inputs outputs)
+ (with-directory-excursion "doc"
+ ;; Fix generation of images for mathematical expressions.
+ (substitute* (find-files "source" "conf\\.py")
+ (("pngmath_use_preview = True")
+ "pngmath_use_preview = False"))
+ (mkdir-p html)
+ (invoke "make" "html" pyver sphinxbuild)
+ (with-directory-excursion "build/html"
+ (for-each (lambda (file)
+ (let* ((dir (dirname file))
+ (tgt-dir (string-append html "/" dir)))
+ (install-file file html)))
+ (find-files ".")))))))
+ (replace 'check
+ (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "/tmp"
+ (invoke "python" "-c"
+ "import scipy; scipy.test(verbose=2)"))))))))
+ (propagated-inputs (list python-numpy python-matplotlib python-pyparsing))
+ (inputs (list openblas pybind11))
+ (native-inputs
+ (list python-cython
+ python-pydata-sphinx-theme
+ python-pytest
+ python-sphinx
+ python-sphinx-panels
+ python-numpydoc
+ gfortran
+ perl
+ which))
(home-page "https://www.scipy.org/")
(synopsis "The Scipy library provides efficient numerical routines")
(description "The SciPy library is one of the core packages that make up
- 53/242: gnu: Add python-jaraco-context., (continued)
- 53/242: gnu: Add python-jaraco-context., guix-commits, 2022/05/11
- 69/242: gnu: python-pathpy: Deprecate by python-path., guix-commits, 2022/05/11
- 67/242: gnu: Add python-ubelt., guix-commits, 2022/05/11
- 70/242: gnu: python-pytest-shutil: Adjust to use python-path., guix-commits, 2022/05/11
- 72/242: gnu: Add python-scikit-build., guix-commits, 2022/05/11
- 78/242: gnu: Add python-afdko., guix-commits, 2022/05/11
- 92/242: gnu: Add python-untangle., guix-commits, 2022/05/11
- 88/242: gnu: Add texlive-bidi., guix-commits, 2022/05/11
- 89/242: gnu: Add font-gfs-ambrosia., guix-commits, 2022/05/11
- 87/242: gnu: Add font-sil-ezra., guix-commits, 2022/05/11
- 74/242: gnu: python-scipy: Move input fields below arguments field.,
guix-commits <=
- 83/242: gnu: Add python-compreffor., guix-commits, 2022/05/11
- 75/242: gnu: python-scipy: Update to 1.8.0 and enable parallel build., guix-commits, 2022/05/11
- 93/242: gnu: python-black: Update to 22.3.0., guix-commits, 2022/05/11
- 95/242: gnu: python-trio: Update to 0.20.0., guix-commits, 2022/05/11
- 96/242: gnu: Add python-pydevd., guix-commits, 2022/05/11
- 99/242: gnu: Add python-pytest-forked-next., guix-commits, 2022/05/11
- 106/242: gnu: Add python-pytest-tornado., guix-commits, 2022/05/11
- 109/242: gnu: python-nbclient: Update to 0.6.0., guix-commits, 2022/05/11
- 110/242: gnu: python-bleach: Update to 5.0.0., guix-commits, 2022/05/11
- 111/242: gnu: Add texlive-unicode-math., guix-commits, 2022/05/11