nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: python-scipy: Update to 1.0.0. 

* gnu/packages/python.scm (python-scipy): Update to 1.0.0.
[arguments]: Remove obsolete FIX-TESTS-PHASE.  Override sphinxbuild in
INSTALL-DOC-PHASE.  Fix PYVER argument.  Use INVOKE instead of SYSTEM*.
[native-inputs]: Remove PYTHON-NOSE.  Add PYTHON-PYTEST and WHICH.
This commit is contained in:
Marius Bakke 2018-02-08 12:31:45 +01:00
parent 2c7f4ae561
commit ba62f087bc
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/packages/python.scm
View File

@ -3533,14 +3533,14 @@ functions.")
(define-public python-scipy (define-public python-scipy
(package (package
(name "python-scipy") (name "python-scipy")
(version "0.19.1") (version "1.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "scipy" version)) (uri (pypi-uri "scipy" version))
(sha256 (sha256
(base32 (base32
"1rl411bvla6q7qfdb47fpdnyjhfgzl6smpha33n9ar1klykjr6m1")))) "043djb3vyk6qripmyw30jhl0g8qza0fmar6wck10iv79l08izsl7"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-numpy" ,python-numpy) `(("python-numpy" ,python-numpy)
@ -3551,11 +3551,12 @@ functions.")
("openblas" ,openblas))) ("openblas" ,openblas)))
(native-inputs (native-inputs
`(("python-cython" ,python-cython) `(("python-cython" ,python-cython)
("python-nose" ,python-nose) ("python-pytest" ,python-pytest)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("python-numpydoc" ,python-numpydoc) ("python-numpydoc" ,python-numpydoc)
("gfortran" ,gfortran) ("gfortran" ,gfortran)
("perl" ,perl))) ("perl" ,perl)
("which" ,which)))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:phases `(#:phases
@ -3584,7 +3585,11 @@ atlas_libs = openblas
(let* ((data (string-append (assoc-ref outputs "doc") "/share")) (let* ((data (string-append (assoc-ref outputs "doc") "/share"))
(doc (string-append data "/doc/" ,name "-" ,version)) (doc (string-append data "/doc/" ,name "-" ,version))
(html (string-append doc "/html")) (html (string-append doc "/html"))
(pyver ,(string-append "PYVER="))) (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 ;; Make installed package available for building the
;; documentation ;; documentation
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
@ -3594,7 +3599,7 @@ atlas_libs = openblas
(("pngmath_use_preview = True") (("pngmath_use_preview = True")
"pngmath_use_preview = False")) "pngmath_use_preview = False"))
(mkdir-p html) (mkdir-p html)
(system* "make" "html" pyver) (invoke "make" "html" pyver sphinxbuild)
(with-directory-excursion "build/html" (with-directory-excursion "build/html"
(for-each (lambda (file) (for-each (lambda (file)
(let* ((dir (dirname file)) (let* ((dir (dirname file))
@ -3602,21 +3607,15 @@ atlas_libs = openblas
(install-file file html))) (install-file file html)))
(find-files "." ".*"))))) (find-files "." ".*")))))
#t)) #t))
(add-after 'unpack 'fix-tests ;; Tests can only be run after the library has been installed and not
(lambda _ ;; within the source directory.
(substitute* "scipy/integrate/tests/test_quadpack.py"
(("libm.so") "libm.so.6"))
#t))
;; Tests can only be run after the library has been installed and not
;; within the source directory.
(delete 'check) (delete 'check)
(add-after 'install 'check (add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(with-directory-excursion "/tmp" (with-directory-excursion "/tmp"
(zero? (system* "python" "-c" (invoke "python" "-c"
"import scipy; scipy.test('full')"))) "import scipy; scipy.test('full', verbose=2)")))))))
#t)))))
(home-page "https://www.scipy.org/") (home-page "https://www.scipy.org/")
(synopsis "The Scipy library provides efficient numerical routines") (synopsis "The Scipy library provides efficient numerical routines")
(description "The SciPy library is one of the core packages that make up (description "The SciPy library is one of the core packages that make up