TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: python2-matplotlib: Update to 2.2.5.

Browse source 
* gnu/packages/python-xyz.scm (python2-matplotlib): Update to 2.2.5.
[phases]: Use G-exp.
{install-jquery-ui}: Delete phase.  JQuery is bundled in this release.
[native-inputs]: Remove all exception pkg-config.
[propagated-inputs]: Sort and explicitly specify all inputs to ease
maintenance.
This commit is contained in:
Maxim Cournoyer 2020-11-21 01:00:48 -05:00
parent ea0ed65c59
commit c704bdd95b
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
gnu/packages/python-xyz.scm
View file

@ -6346,53 +6346,47 @@ (define-public python-matplotlib
(define-public python2-matplotlib (define-public python2-matplotlib
(let ((matplotlib (package-with-python2 (let ((matplotlib (package-with-python2
(strip-python2-variant python-matplotlib)))) (strip-python2-variant python-matplotlib))))
(package (inherit matplotlib) (package/inherit matplotlib
(version "2.2.4") (version "2.2.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "matplotlib" version)) (uri (pypi-uri "matplotlib" version))
(sha256 (sha256
(base32 (base32
"09i1gnrra1590brc1f8d5rh2zvnknmfgzp613ab0462qkrwj15h2")))) "1sk05fdai9rw35l983rw2ymvz0nafs7szs7yz4nxrpyr1j27l0x3"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments matplotlib) (substitute-keyword-arguments (package-arguments matplotlib)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(replace 'install-jquery-ui (add-after 'install 'create-init-file
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda _
(let ((dir (string-append (assoc-ref outputs "out") (with-output-to-file
"/lib/python2.7/site-packages/" (string-append
"matplotlib/backends/web_backend/"))) #$output
(mkdir-p dir) "/lib/python2.7/site-packages/mpl_toolkits/__init__.py")
(invoke "unzip" (lambda _ (display "")))))
(assoc-ref inputs "jquery-ui") (delete 'fix-and-disable-failing-tests)
"-d" dir)))) (delete 'check))))) ; These tests weren't run the the past.
;; Without this file mpl_toolkits cannot be imported. (native-inputs
(add-after 'install 'create-init-file `(("pkg-config" ,pkg-config)))
(lambda* (#:key outputs #:allow-other-keys)
(with-output-to-file
(string-append
(assoc-ref outputs "out")
"/lib/python2.7/site-packages/mpl_toolkits/__init__.py")
(lambda _ (display "")))))
(delete 'fix-and-disable-failing-tests)
(delete 'check))))) ; These tests weren't run the the past.
;; Make sure to use special packages for Python 2 instead
;; of those automatically rewritten by package-with-python2.
(propagated-inputs (propagated-inputs
`(("python2-pycairo" ,python2-pycairo) `(("gobject-introspection" ,gobject-introspection)
("python2-backports-functools-lru-cache" ("python2-backports-functools-lru-cache" ,python2-backports-functools-lru-cache)
,python2-backports-functools-lru-cache) ("python2-certifi" ,python2-certifi)
("python2-cycler" ,python2-cycler)
("python2-dateutil" ,python2-dateutil)
("python2-functools32" ,python2-functools32) ("python2-functools32" ,python2-functools32)
("python2-kiwisolver" ,python2-kiwisolver)
("python2-numpy" ,python2-numpy)
("python2-pillow" ,python2-pillow)
("python2-pycairo" ,python2-pycairo)
("python2-pygobject-2" ,python2-pygobject-2) ("python2-pygobject-2" ,python2-pygobject-2)
("python2-pyparsing" ,python2-pyparsing)
("python2-pytz" ,python2-pytz)
("python2-six" ,python2-six)
("python2-subprocess32" ,python2-subprocess32) ("python2-subprocess32" ,python2-subprocess32)
("python2-tkinter" ,python-2 "tk") ("python2-tkinter" ,python-2 "tk"))))))
,@(fold alist-delete (package-propagated-inputs matplotlib)
'("python-cairocffi"
"python-pycairo"
"python-pygobject"
"python-tkinter")))))))
(define-public python-matplotlib-documentation (define-public python-matplotlib-documentation
(package (package