[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
236/242: gnu: python-matplotlib: Update to 3.5.2.
From: |
guix-commits |
Subject: |
236/242: gnu: python-matplotlib: Update to 3.5.2. |
Date: |
Thu, 12 May 2022 14:14:53 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 1fd6bcfba7442f7b4fa2f610a8a84be7c5274a3b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon May 9 22:57:54 2022 -0400
gnu: python-matplotlib: Update to 3.5.2.
* gnu/packages/python-xyz.scm (python-matplotlib): Update to 3.5.2.
[propagated-inputs]: Move after 'arguments' field. Use new style and
re-order.
[inputs]: Order lexicographically.
[native-inputs]: Use new style.
[phases]{fix-and-disable-failing-tests}: Fix indentation.
Delete the 'lib/matplotlib/tests/test_animation.py' test.
{check}: Skip the test_lazy_auto_backend_selection test.
---
gnu/packages/python-xyz.scm | 95 ++++++++++++++++++++++++---------------------
1 file changed, 51 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 69c16411d8..1fe9a969aa 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6625,51 +6625,14 @@ comparison.
(define-public python-matplotlib
(package
(name "python-matplotlib")
- (version "3.5.1")
+ (version "3.5.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "matplotlib" version))
(sha256
- (base32 "076f8qi265x8jy89c03r3vv5h4is4ir5mawwrrrpp96314783sdj"))))
- (build-system python-build-system)
- (propagated-inputs ; the following packages are all needed at run time
- `(("python-cycler" ,python-cycler)
- ("python-fonttools" ,python-fonttools)
- ("python-kiwisolver" ,python-kiwisolver)
- ("python-packaging" ,python-packaging)
- ("python-pyparsing" ,python-pyparsing)
- ("python-pygobject" ,python-pygobject)
- ("python-certifi" ,python-certifi)
- ("gobject-introspection" ,gobject-introspection)
- ("python-tkinter" ,python "tk")
- ("python-dateutil" ,python-dateutil)
- ("python-numpy" ,python-numpy)
- ("python-pillow" ,python-pillow)
- ("python-pytz" ,python-pytz)
- ("python-six" ,python-six)
- ("python-wxpython" ,python-wxpython)
- ;; From version 1.4.0 'matplotlib' makes use of 'cairocffi' instead of
- ;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo' 'context'
- ;; object. For this reason we need to import both libraries.
- ;;
https://cairocffi.readthedocs.io/en/stable/cffi_api.html#converting-pycairo-wrappers-to-cairocffi
- ("python-pycairo" ,python-pycairo)
- ("python-cairocffi" ,python-cairocffi)))
- (inputs
- (list libpng
- freetype
- qhull
- cairo
- glib
- tcl
- tk))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("python-pytest" ,python-pytest)
- ("python-pytest-timeout" ,python-pytest-timeout)
- ("python-pytest-xdist" ,python-pytest-xdist)
- ("python-setuptools-scm" ,python-setuptools-scm)
- ("python-setuptools-scm-git-archive"
,python-setuptools-scm-git-archive)))
+ (base32 "18h78s5ld1i6mz00w258hy29909nfr3ddq6ry9kq18agw468bks8"))))
+ (build-system python-build-system)
(arguments
(list
#:phases
@@ -6687,8 +6650,8 @@ comparison.
(lambda _
(substitute* (append (find-files "lib/matplotlib/tests/"
"test_.*\\.py$")
- (find-files "lib/mpl_toolkits/tests"
- "test_.*\\.py$"))
+ (find-files "lib/mpl_toolkits/tests"
+ "test_.*\\.py$"))
(("^from matplotlib" match)
(string-append "import pytest\n" match))
(("( *)@([^_]+_)*(image_comparison|check_figures_equal)" match
@@ -6711,7 +6674,11 @@ reason=\"unknown minor image differences\")\n" match)))
;; different version of FreeType.
"lib/matplotlib/tests/test_constrainedlayout.py"
;; Fontconfig returns no fonts.
- "lib/matplotlib/tests/test_font_manager.py"))))
+ "lib/matplotlib/tests/test_font_manager.py"
+ ;; The images comparison test fails
+ ;; non-deterministically when run in parallel (see:
+ ;;
https://github.com/matplotlib/matplotlib/issues/22992).
+ "lib/matplotlib/tests/test_compare_images.py"))))
(add-before 'build 'configure-environment
(lambda* (#:key inputs #:allow-other-keys)
;; Fix rounding errors when using the x87 FPU.
@@ -6741,7 +6708,47 @@ tests = True~%" (assoc-ref inputs "tcl") (assoc-ref
inputs "tk"))))))
;; everything gets built in the source directory.
(invoke "pytest"
"-n" (number->string (parallel-job-count))
- "-m" "not network" "--pyargs" "matplotlib"))))))))
+ "-m" "not network" "--pyargs" "matplotlib"
+ ;; The 'test_lazy_auto_backend_selection' fails
+ ;; because it would require an X server; skip it.
+ "-k" "not test_lazy_auto_backend_selection"))))))))
+ (propagated-inputs
+ (list gobject-introspection
+ python-cairocffi
+ python-certifi
+ python-cycler
+ python-dateutil
+ python-fonttools
+ python-kiwisolver
+ python-numpy
+ python-packaging
+ python-pillow
+ ;; ;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo'
'context'
+ ;; ;; From version 1.4.0 'matplotlib' makes use of 'cairocffi'
instead of
+ ;; ;;
https://cairocffi.readthedocs.io/en/stable/cffi_api.html#converting-pycairo-wrappers-to-cairocffi
+ ;; ;; object. For this reason we need to import both libraries.
+ ;; python-pycairo
+ python-pygobject
+ python-pyparsing
+ python-pytz
+ python-six
+ `(,python "tk")
+ python-wxpython))
+ (inputs
+ (list cairo
+ freetype
+ glib
+ libpng
+ qhull
+ tcl
+ tk))
+ (native-inputs
+ (list pkg-config
+ python-pytest
+ python-pytest-timeout
+ python-pytest-xdist
+ python-setuptools-scm
+ python-setuptools-scm-git-archive))
(home-page "https://matplotlib.org/")
(synopsis "2D plotting library for Python")
(description
- 142/242: gnu: python-httpx: Update to 0.22.0., (continued)
- 142/242: gnu: python-httpx: Update to 0.22.0., guix-commits, 2022/05/12
- 144/242: gnu: Add python-socksio., guix-commits, 2022/05/12
- 148/242: gnu: Add python-aioredis., guix-commits, 2022/05/12
- 157/242: gnu: python-numba: Update to 0.55.1., guix-commits, 2022/05/12
- 168/242: gnu: python-jupyter-kernel-mgmt: Update to 0.5.1 and disable tests., guix-commits, 2022/05/12
- 201/242: gnu: markets: Add python-wrapper to fix build., guix-commits, 2022/05/12
- 192/242: gnu: python-cantools: Update to 37.0.7., guix-commits, 2022/05/12
- 214/242: gnu: python-sphinx: Update to 4.5.0., guix-commits, 2022/05/12
- 205/242: gnu: python-keyring: Fix test suite., guix-commits, 2022/05/12
- 218/242: gnu: python-sphinxcontrib-websupport: Update to 1.2.4., guix-commits, 2022/05/12
- 236/242: gnu: python-matplotlib: Update to 3.5.2.,
guix-commits <=
- 63/242: gnu: Add psautohint-font-data., guix-commits, 2022/05/12
- 62/242: gnu: Add python-pytest-randomly., guix-commits, 2022/05/12
- 59/242: gnu: Add python-pytest-perf., guix-commits, 2022/05/12
- 65/242: gnu: Add python-ordered-set., guix-commits, 2022/05/12
- 69/242: gnu: python-pathpy: Deprecate by python-path., guix-commits, 2022/05/12
- 67/242: gnu: Add python-ubelt., guix-commits, 2022/05/12
- 66/242: gnu: Add python-xdoctest., guix-commits, 2022/05/12
- 71/242: gnu: python-pytest-cov: Update to 3.0.0., guix-commits, 2022/05/12
- 104/242: gnu: python-jupyter-client: Update to 7.2.2., guix-commits, 2022/05/12
- 97/242: gnu: Add python-debugpy., guix-commits, 2022/05/12