gnu: python-matplotlib: Update to 2.2.2.

* gnu/packages/python.scm (python-matplotlib): Update to 2.2.2.
[propagated-inputs]: Add PYTHON-KIWISOLVER.
(python2-matplotlib)[propagated-inputs]: Add PYTHON2-BACKPORTS-FUNCTOOLS-LRU-CACHE.
(python-matplotlib-documentation)[native-inputs]: Change PYTHON-SPHINX to
PYTHON-SPHINX-1.6.  Add PYTHON-SPHINX-GALLERY.
This commit is contained in:
Marius Bakke 2018-05-02 17:37:47 +02:00
parent 02dc4b8095
commit 4a3ac362bb
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -3372,17 +3372,18 @@ (define-public python2-colorspacious
(define-public python-matplotlib (define-public python-matplotlib
(package (package
(name "python-matplotlib") (name "python-matplotlib")
(version "2.0.2") (version "2.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "matplotlib" version)) (uri (pypi-uri "matplotlib" version))
(sha256 (sha256
(base32 (base32
"1w8z2a1l7s72p1byfz7g03wqhygqxi8w82619dqb3a1lm97w9yqg")))) "1s6dv225w3k4fv52h8lfjc7qq5y56i9755ayx0mz48ddi99fzisd"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs ; the following packages are all needed at run time (propagated-inputs ; the following packages are all needed at run time
`(("python-cycler" ,python-cycler) `(("python-cycler" ,python-cycler)
("python-kiwisolver" ,python-kiwisolver)
("python-pyparsing" ,python-pyparsing) ("python-pyparsing" ,python-pyparsing)
("python-pygobject" ,python-pygobject) ("python-pygobject" ,python-pygobject)
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
@ -3462,6 +3463,8 @@ (define-public python2-matplotlib
;; of those automatically rewritten by package-with-python2. ;; of those automatically rewritten by package-with-python2.
(propagated-inputs (propagated-inputs
`(("python2-pycairo" ,python2-pycairo) `(("python2-pycairo" ,python2-pycairo)
("python2-backports-functools-lru-cache"
,python2-backports-functools-lru-cache)
("python2-functools32" ,python2-functools32) ("python2-functools32" ,python2-functools32)
("python2-pygobject-2" ,python2-pygobject-2) ("python2-pygobject-2" ,python2-pygobject-2)
("python2-subprocess32" ,python2-subprocess32) ("python2-subprocess32" ,python2-subprocess32)
@ -3478,7 +3481,8 @@ (define-public python-matplotlib-documentation
(native-inputs (native-inputs
`(("python-matplotlib" ,python-matplotlib) `(("python-matplotlib" ,python-matplotlib)
("python-colorspacious" ,python-colorspacious) ("python-colorspacious" ,python-colorspacious)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx-1.6)
("python-sphinx-gallery" ,python-sphinx-gallery)
("python-numpydoc" ,python-numpydoc) ("python-numpydoc" ,python-numpydoc)
("python-ipython" ,python-ipython) ("python-ipython" ,python-ipython)
("python-mock" ,python-mock) ("python-mock" ,python-mock)
@ -3501,7 +3505,7 @@ (define-public python-matplotlib-documentation
(("latex_elements\\['pointsize'\\] = '11pt'" match) (("latex_elements\\['pointsize'\\] = '11pt'" match)
;; insert at a point where latex_elements{} is defined: ;; insert at a point where latex_elements{} is defined:
(string-append match "\nlatex_elements['papersize'] = 'a4paper'"))) (string-append match "\nlatex_elements['papersize'] = 'a4paper'")))
(zero? (system* "python" "make.py" "html" "latex" "texinfo")))) (invoke "make" "SPHINXBUILD=sphinx-build" "html" "latex" "texinfo")))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((data (string-append (assoc-ref outputs "out") "/share")) (let* ((data (string-append (assoc-ref outputs "out") "/share"))