diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-06 11:03:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-06 11:03:27 +0200 |
| commit | 6a317919cf0f9dbc651a4a41f9ed99c49bf2d543 (patch) | |
| tree | 9454b6c587b75ee1e3625be64f39cc39a5154db6 /gnu/packages/python.scm | |
| parent | 68932812b8f6581dda4bf1896235492f687b7cc9 (diff) | |
| parent | 8bde6a524e19d2bc9763b84dbf99959faf653bf8 (diff) | |
| download | gnu-guix-6a317919cf0f9dbc651a4a41f9ed99c49bf2d543.tar gnu-guix-6a317919cf0f9dbc651a4a41f9ed99c49bf2d543.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b13880e50e..00c9917392 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3714,24 +3714,27 @@ producing implementations of dynamic languages, emphasizing a clean separation between language specification and implementation aspects.") (license license:expat))) +;; NOTE: when upgrading numpy please make sure that python-pandas and +;; python-scipy still build, as these three packages are often used together. (define-public python-numpy (package (name "python-numpy") - (version "1.13.1") + (version "1.12.0") (source (origin (method url-fetch) - (uri (pypi-uri "numpy" version ".zip")) + (uri (string-append + "https://github.com/numpy/numpy/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1fsgkhh1vdkhmlz8vmdgxnj9n9yaanckxxzz9s0b4p08fqvjic69")))) + "025d4j4aakcp8w5i5diqh812cbbjgac7jszx1j56ivrbi1i8vv7d")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) ("lapack" ,lapack))) (native-inputs - `(("unzip" ,unzip) - ("python-cython" ,python-cython) + `(("python-cython" ,python-cython) ("python-nose" ,python-nose) ("gfortran" ,gfortran))) (arguments @@ -3789,6 +3792,26 @@ capabilities.") (define-public python2-numpy (package-with-python2 python-numpy)) +(define-public python-numpy-next + (package (inherit python-numpy) + (name "python-numpy-next") + (version "1.13.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "numpy" version ".zip")) + (sha256 + (base32 + "1fsgkhh1vdkhmlz8vmdgxnj9n9yaanckxxzz9s0b4p08fqvjic69")))) + (native-inputs + `(("unzip" ,unzip) + ("python-cython" ,python-cython) + ("python-nose" ,python-nose) + ("gfortran" ,gfortran))))) + +(define-public python2-numpy-next + (package-with-python2 python-numpy-next)) + (define-public python-munch (package (name "python-munch") |