summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-12-22 18:27:20 +0200
committerEfraim Flashner <efraim@flashner.co.il>2021-12-22 21:17:19 +0200
commite8c1562599c7ebee8b7b228237fb0d75d4472a61 (patch)
tree799ceb4ff8ab1e8b18bae18ba5162bb5a970fc38 /gnu
parent46143878074b1935b653d9f44f408ac04fc71f70 (diff)
gnu: python-scipy: Update to 1.7.3.
* gnu/packages/python-science.scm (python-scipy): Update to 1.7.3. [native-inputs]: Add python-pydata-sphinx-theme, python-sphinx-panels. [arguments]: Add phase to build without python-pythran. Remove trailing #t from phases. * gnu/packages/sphinx.scm (python-pydata-sphinx-theme)[native-inputs]: Remove python-plotly.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/python-science.scm21
-rw-r--r--gnu/packages/sphinx.scm1
2 files changed, 11 insertions, 11 deletions
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 393e59896d..1311fbad0c 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -66,13 +66,13 @@
(define-public python-scipy
(package
(name "python-scipy")
- (version "1.6.0")
+ (version "1.7.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "scipy" version))
(sha256
- (base32 "0rh5b1rwdcvvagld8vpxnpaibszy1skpx39a0fwzd5gx5pwcjvfb"))))
+ (base32 "1gxsnw6viz2j3sm8ak2a8l7fcn4b2zm3kzfm8w57xxyyrzx7an5b"))))
(build-system python-build-system)
(propagated-inputs
(list python-numpy python-matplotlib python-pyparsing))
@@ -80,8 +80,10 @@
(list openblas pybind11))
(native-inputs
(list python-cython
+ python-pydata-sphinx-theme
python-pytest
python-sphinx
+ python-sphinx-panels
python-numpydoc
gfortran
perl
@@ -90,11 +92,13 @@
(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")
- #t))
+ (setenv "HOME" "/tmp")))
(add-after 'unpack 'disable-broken-tests
(lambda _
(substitute* "scipy/sparse/linalg/dsolve/tests/test_linsolve.py"
@@ -105,8 +109,7 @@
(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)))
- #t))
+ m)))))
(add-before 'build 'configure-openblas
(lambda* (#:key inputs #:allow-other-keys)
(call-with-output-file "site.cfg"
@@ -124,8 +127,7 @@ atlas_libs = openblas
"
(assoc-ref inputs "openblas")
(assoc-ref inputs "openblas")
- (assoc-ref inputs "openblas"))))
- #t))
+ (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"))
@@ -151,8 +153,7 @@ atlas_libs = openblas
(let* ((dir (dirname file))
(tgt-dir (string-append html "/" dir)))
(install-file file html)))
- (find-files "." ".*")))))
- #t))
+ (find-files ".")))))))
;; Tests can only be run after the library has been installed and not
;; within the source directory.
(delete 'check)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 69592b14b3..4597a22ba0 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -956,7 +956,6 @@ automated way to document command-line programs. It scans
python-numpy
python-numpydoc
python-pandas
- python-plotly
python-pytest
python-pytest-regressions
python-recommonmark