extra/python-matplotlib to 3.10.0-1

This commit is contained in:
David Beauchamp 2025-01-06 08:37:04 -05:00
parent 2e48d56696
commit d23db2ee10
3 changed files with 42 additions and 15 deletions
extra/python-matplotlib

View file

@ -1,7 +1,7 @@
pkgbase = python-matplotlib
pkgdesc = A python plotting library, making publication quality plots
pkgver = 3.9.3
pkgrel = 2
pkgver = 3.10.0
pkgrel = 1
url = https://matplotlib.org
arch = x86_64
license = custom
@ -39,6 +39,7 @@ pkgbase = python-matplotlib
checkdepends = noto-fonts-cjk
checkdepends = wqy-zenhei
checkdepends = python-xcffib
checkdepends = ttf-dejavu
makedepends = git
makedepends = python-build
makedepends = python-installer
@ -74,13 +75,13 @@ pkgbase = python-matplotlib
optdepends = texlive-fontsrecommended: usetex dependencies
optdepends = texlive-latexrecommended: usetex usage with pdflatex
optdepends = python-certifi: https support
source = git+https://github.com/matplotlib/matplotlib.git#tag=v3.9.3?signed
source = https://github.com/QuLogic/mpl-images/archive/v3.9.1-with-freetype-2.13.1/mpl-images-3.9.1-ft2.13.1.tar.gz
source = git+https://github.com/matplotlib/matplotlib.git#tag=v3.10.0?signed
source = https://github.com/QuLogic/mpl-images/archive/v3.10.0-with-freetype-2.13.1/mpl-images-3.10.0-ft2.13.1.tar.gz
source = freetype.patch
validpgpkeys = 23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10
validpgpkeys = EB8322187FD451192E430A7279B3FEC456F12599
b2sums = 11211a81f66978df0ebe0cc3f1143e6dab2e460b6142393c651346ac21b17b7dffd3c3c3bd61b9e7d356836c883bda2e7f1c194891eff58413c69c064ce63f09
b2sums = 91726a2a3e76cb46f9fec612f6193b4c55f0b4b21f0089520c3733521887f083b4ec16d17906f9eba57dcde3d2015e429de7b7a236de2ab58eebd88187f6bf5c
b2sums = 824c69807b13853ad8be20ded60eca18260af50b652a317dc8235d5828c060982363d2aa6feb98d5340e86dab5b87c7f6e7dd1f4c050e2e3613266209e633a60
b2sums = 5a6c87aec6b1ea5111e5b03c5e002e650a006153e1728910ebfde8637e50ac87964c291d61df5ce191b298673c943de21fd91f16a5ded8b8e6ca40a6377fd9c3
b2sums = 63f89667204996c6a78c297bda22526ceb25112c0ccbe14a07b92772e8f9b4bad213e8fd27a4ce25bd2fa983bbc6450b66b5315d92f444f8105f6ece5aca0601
b2sums = bb8546a237dec0cf49c5a8315ad1771051d405b90c7dda5b572d2f4f2a24bb0a1116337070092bd6c568f9d16ced9494afd4c6c484e5ce42044d947239164ae4
pkgname = python-matplotlib

View file

@ -10,9 +10,9 @@
# - disable lto via setup.cfg
pkgname=python-matplotlib
pkgver=3.9.3
pkgrel=2
_mpl_images_ver=3.9.1
pkgver=3.10.0
pkgrel=1
_mpl_images_ver=3.10.0
pkgdesc="A python plotting library, making publication quality plots"
arch=(x86_64)
url="https://matplotlib.org"
@ -42,14 +42,14 @@ checkdepends=(python-pytest python-pytest-xdist python-pytest python-pytest-reru
python-pyqt6 pyside6 python-tornado python-wxpython tk
jupyter-nbconvert jupyter-nbformat python-ipykernel
python-pandas python-pikepdf python-pytz python-xarray
noto-fonts-cjk wqy-zenhei python-xcffib)
noto-fonts-cjk wqy-zenhei python-xcffib ttf-dejavu)
_ftver=2.13.1
source=(git+https://github.com/matplotlib/matplotlib.git#tag=v${pkgver}?signed
https://github.com/QuLogic/mpl-images/archive/v${_mpl_images_ver}-with-freetype-${_ftver}/mpl-images-${_mpl_images_ver}-ft${_ftver}.tar.gz
freetype.patch)
b2sums=('11211a81f66978df0ebe0cc3f1143e6dab2e460b6142393c651346ac21b17b7dffd3c3c3bd61b9e7d356836c883bda2e7f1c194891eff58413c69c064ce63f09'
'91726a2a3e76cb46f9fec612f6193b4c55f0b4b21f0089520c3733521887f083b4ec16d17906f9eba57dcde3d2015e429de7b7a236de2ab58eebd88187f6bf5c'
'824c69807b13853ad8be20ded60eca18260af50b652a317dc8235d5828c060982363d2aa6feb98d5340e86dab5b87c7f6e7dd1f4c050e2e3613266209e633a60')
b2sums=('5a6c87aec6b1ea5111e5b03c5e002e650a006153e1728910ebfde8637e50ac87964c291d61df5ce191b298673c943de21fd91f16a5ded8b8e6ca40a6377fd9c3'
'63f89667204996c6a78c297bda22526ceb25112c0ccbe14a07b92772e8f9b4bad213e8fd27a4ce25bd2fa983bbc6450b66b5315d92f444f8105f6ece5aca0601'
'bb8546a237dec0cf49c5a8315ad1771051d405b90c7dda5b572d2f4f2a24bb0a1116337070092bd6c568f9d16ced9494afd4c6c484e5ce42044d947239164ae4')
validpgpkeys=(23CAB59E3332F94D26BEF0378D86E7FAE5EB0C10 # Elliott Sales de Andrade <quantum.analyst@gmail.com>
EB8322187FD451192E430A7279B3FEC456F12599) # Kyle Sunden <contact@ksunden.space>
@ -58,7 +58,7 @@ prepare() {
# Fix SCM detected version
rm -r .git
# Don't require oldest-supported-numpy
sed -e 's|oldest-supported-numpy|numpy|' -i pyproject.toml
sed -e 's|oldest-supported-numpy|numpy|' -e 's|,<0.17.0||' -i pyproject.toml
patch -p1 < ../freetype.patch # From Fedora/upstream
sed -e 's|2_000_000|2_500_000|' -i lib/matplotlib/tests/test_backends_interactive.py
# Use appropriate baseline images for tests

View file

@ -114,6 +114,15 @@ index 4dc4d9501e..47a4e80bb5 100644
@pytest.mark.parametrize('arg, state', [
@@ -675,7 +675,7 @@
title = fig.suptitle("Title")
fig.draw_without_rendering()
- assert title.get_position()[1] == pytest.approx(0.7457, abs=1e-3)
+ assert title.get_position()[1] == pytest.approx(0.7457, abs=1e-2)
title = fig.suptitle("Title", y=0.98)
fig.draw_without_rendering()
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
index 0353f1408b..f5b341daaa 100644
--- a/lib/matplotlib/tests/test_legend.py
@ -169,3 +178,20 @@ index 9c654f4d1f..9678e34a80 100644
--
2.44.0
diff -ru matplotlib.orig/lib/matplotlib/tests/test_ft2font.py matplotlib/lib/matplotlib/tests/test_ft2font.py
--- matplotlib.orig/lib/matplotlib/tests/test_ft2font.py 2024-12-25 10:47:55.547681792 +0100
+++ matplotlib/lib/matplotlib/tests/test_ft2font.py 2024-12-25 10:48:02.724436421 +0100
@@ -703,10 +703,10 @@
@pytest.mark.parametrize('left, right, unscaled, unfitted, default', [
# These are all the same class.
- ('A', 'A', 57, 248, 256), ('A', 'À', 57, 248, 256), ('A', 'Á', 57, 248, 256),
- ('A', 'Â', 57, 248, 256), ('A', 'Ã', 57, 248, 256), ('A', 'Ä', 57, 248, 256),
+ ('A', 'A', 57, 247, 256), ('A', 'À', 57, 247, 256), ('A', 'Á', 57, 247, 256),
+ ('A', 'Â', 57, 247, 256), ('A', 'Ã', 57, 247, 256), ('A', 'Ä', 57, 247, 256),
# And a few other random ones.
- ('D', 'A', -36, -156, -128), ('T', '.', -243, -1056, -1024),
+ ('D', 'A', -36, -156, -128), ('T', '.', -243, -1055, -1024),
('X', 'C', -149, -647, -640), ('-', 'J', 114, 495, 512),
])
def test_ft2font_get_kerning(left, right, unscaled, unfitted, default):