[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
76/145: gnu: python2-matplotlib: Update to 2.2.5.
From: |
guix-commits |
Subject: |
76/145: gnu: python2-matplotlib: Update to 2.2.5. |
Date: |
Mon, 10 Jan 2022 11:44:11 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 5eda81eb3c8ddb0e56b41e3f94c35f26c35511bc
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Nov 21 01:00:48 2020 -0500
gnu: python2-matplotlib: Update to 2.2.5.
* 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.
---
gnu/packages/python-xyz.scm | 62 ++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b663622822..1aeb17f204 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6347,53 +6347,47 @@ toolkits.")
(define-public python2-matplotlib
(let ((matplotlib (package-with-python2
(strip-python2-variant python-matplotlib))))
- (package (inherit matplotlib)
- (version "2.2.4")
+ (package/inherit matplotlib
+ (version "2.2.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "matplotlib" version))
(sha256
(base32
- "09i1gnrra1590brc1f8d5rh2zvnknmfgzp613ab0462qkrwj15h2"))))
+ "1sk05fdai9rw35l983rw2ymvz0nafs7szs7yz4nxrpyr1j27l0x3"))))
(arguments
(substitute-keyword-arguments (package-arguments matplotlib)
((#:phases phases)
- `(modify-phases ,phases
- (replace 'install-jquery-ui
- (lambda* (#:key outputs inputs #:allow-other-keys)
- (let ((dir (string-append (assoc-ref outputs "out")
- "/lib/python2.7/site-packages/"
-
"matplotlib/backends/web_backend/")))
- (mkdir-p dir)
- (invoke "unzip"
- (assoc-ref inputs "jquery-ui")
- "-d" dir))))
- ;; Without this file mpl_toolkits cannot be imported.
- (add-after 'install 'create-init-file
- (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.
+ #~(modify-phases #$phases
+ (add-after 'install 'create-init-file
+ (lambda _
+ (with-output-to-file
+ (string-append
+ #$output
+ "/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.
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(propagated-inputs
- `(("python2-pycairo" ,python2-pycairo)
- ("python2-backports-functools-lru-cache"
- ,python2-backports-functools-lru-cache)
+ `(("gobject-introspection" ,gobject-introspection)
+ ("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-kiwisolver" ,python2-kiwisolver)
+ ("python2-numpy" ,python2-numpy)
+ ("python2-pillow" ,python2-pillow)
+ ("python2-pycairo" ,python2-pycairo)
("python2-pygobject-2" ,python2-pygobject-2)
+ ("python2-pyparsing" ,python2-pyparsing)
+ ("python2-pytz" ,python2-pytz)
+ ("python2-six" ,python2-six)
("python2-subprocess32" ,python2-subprocess32)
- ("python2-tkinter" ,python-2 "tk")
- ,@(fold alist-delete (package-propagated-inputs matplotlib)
- '("python-cairocffi"
- "python-pycairo"
- "python-pygobject"
- "python-tkinter")))))))
+ ("python2-tkinter" ,python-2 "tk"))))))
(define-public python-matplotlib-documentation
(package
- 92/145: build-system/gnu: Make gzip files writable before resetting timestamps., (continued)
- 92/145: build-system/gnu: Make gzip files writable before resetting timestamps., guix-commits, 2022/01/10
- 130/145: gnu: mozjs-78: Disable rust-simd to workaround a build failure., guix-commits, 2022/01/10
- 64/145: gnu: Add python-tomli-w., guix-commits, 2022/01/10
- 54/145: gnu: tracker: Add python to native inputs., guix-commits, 2022/01/10
- 137/145: gnu: rust-predicates-2: Update to 2.0.3., guix-commits, 2022/01/10
- 87/145: gnu: python-pysam: Update to 0.18.0., guix-commits, 2022/01/10
- 121/145: gnu: python-openpyxl: Update to 3.0.9., guix-commits, 2022/01/10
- 61/145: gnu: python-typing: Update to 3.10.0.0., guix-commits, 2022/01/10
- 107/145: gnu: arcanist: Remove obsolete phase., guix-commits, 2022/01/10
- 84/145: gnu: htslib: Update to 1.14., guix-commits, 2022/01/10
- 76/145: gnu: python2-matplotlib: Update to 2.2.5.,
guix-commits <=
- 82/145: gnu: poetry: Update to 1.1.12., guix-commits, 2022/01/10
- 88/145: gnu: Add plfit., guix-commits, 2022/01/10
- 91/145: gnu: tbb-2020: Use ld.gold to work around segfaults in check phase., guix-commits, 2022/01/10
- 129/145: build/python: Improve error output in sanity check., guix-commits, 2022/01/10
- 66/145: gnu: python-flit: Update to 3.5.1, enable tests and apply guix style., guix-commits, 2022/01/10
- 60/145: gnu: python-flit-core: Propagate python-tomli instead of python-toml., guix-commits, 2022/01/10
- 98/145: gnu: go-golang-org-x-crypto: Remove obsolete phase., guix-commits, 2022/01/10
- 114/145: gnu: glib: Update to 2.70.2., guix-commits, 2022/01/10
- 108/145: gnu: python-pdfminer-six: Remove obsolete phase., guix-commits, 2022/01/10