[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: |
Wed, 11 May 2022 18:03:32 -0400 (EDT) |
apteryx pushed a commit to branch wip-ipython-polyglossia
in repository guix.
commit f27bc6cdbd5c417e014cabd6eb015d624648724f
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 572a40c85f..9f31bbc12a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6615,51 +6615,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
@@ -6677,8 +6640,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
@@ -6701,7 +6664,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.
@@ -6731,7 +6698,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
- 206/242: gnu: Remove python2-keyring., (continued)
- 206/242: gnu: Remove python2-keyring., guix-commits, 2022/05/11
- 211/242: gnu: python2-sqlalchemy: Skip a failing test., guix-commits, 2022/05/11
- 220/242: gnu: python-sphinx-argparse: Update to 0.3.1., guix-commits, 2022/05/11
- 214/242: gnu: python-sphinx: Update to 4.5.0., guix-commits, 2022/05/11
- 230/242: gnu: Add python-mpl-sphinx-theme., guix-commits, 2022/05/11
- 224/242: gnu: python-sphinx-autodoc-typehints: Update to 1.18.1., guix-commits, 2022/05/11
- 239/242: gnu: Add python-sanic-routing., guix-commits, 2022/05/11
- 234/242: gnu: python-qtconsole: Update to 5.3.0., guix-commits, 2022/05/11
- 237/242: gnu: python-pytest-sanic: Update to 1.9.1., guix-commits, 2022/05/11
- 241/242: gnu: Add python-sanic-testing., guix-commits, 2022/05/11
- 236/242: gnu: python-matplotlib: Update to 3.5.2.,
guix-commits <=
- 228/242: gnu: Add python-ipdb., guix-commits, 2022/05/11
- 240/242: gnu: Add python-sanic-bootstrap., guix-commits, 2022/05/11
- 223/242: gnu: Add python-nptyping., guix-commits, 2022/05/11
- 225/242: gnu: python-sphinxext-opengraph: Update to 0.6.3., guix-commits, 2022/05/11
- 215/242: gnu: python-pydata-sphinx-theme: Update to 0.7.2., guix-commits, 2022/05/11
- 221/242: gnu: python-sphinx-cloud-sptheme: Update to 1.10.1 [still broken]., guix-commits, 2022/05/11
- 80/242: gnu: Add skia., guix-commits, 2022/05/11
- 79/242: gnu: Add python-cffsubr., guix-commits, 2022/05/11
- 02/242: gnu: python-astroid: Propagate python-typing-extensions., guix-commits, 2022/05/11
- 08/242: gnu: python-jinja2: Update to 3.1.1., guix-commits, 2022/05/11