diff --git a/.gitignore b/.gitignore index 7297043..dfebb45 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,5 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-3.8.0rc1-with-freetype-2.13.1.tar.gz /matplotlib-3.8.0.tar.gz /matplotlib-3.8.0-with-freetype-2.13.1.tar.gz +/matplotlib-3.8.1.tar.gz +/matplotlib-3.8.1-with-freetype-2.13.1.tar.gz diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 3fe92e1..eaa9bd6 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,4 +1,4 @@ -From ad95c0abec7677bc256b5a1fc198c16c4539a6d0 Mon Sep 17 00:00:00 2001 +From a035d73964343cbba0daad79b9349153a51af56a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 Subject: [PATCH 1/5] matplotlibrc path search fix @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index 1e3dab1b33..324b9bcabd 100644 +index 353406832c..26dd9372e1 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -582,7 +582,8 @@ def get_cachedir(): diff --git a/0002-Unpin-NumPy-build-requirement.patch b/0002-Unpin-NumPy-build-requirement.patch index 08c035b..65a283f 100644 --- a/0002-Unpin-NumPy-build-requirement.patch +++ b/0002-Unpin-NumPy-build-requirement.patch @@ -1,4 +1,4 @@ -From 9a1f728c8f56aaa1961cc9690e169ae5e31054d5 Mon Sep 17 00:00:00 2001 +From 789bb69a3175c6ecc03449128d72cac63522d98f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 11 Aug 2023 02:36:06 -0400 Subject: [PATCH 2/5] Unpin NumPy build requirement @@ -13,7 +13,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index d2e2f769b7..d2e4153202 100644 +index 7131609c63..e76ec736d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ index d2e2f769b7..d2e4153202 100644 - "numpy>=1.25", + "numpy", "pybind11>=2.6", - "setuptools>=42", + "setuptools>=64", "setuptools_scm>=7", -- 2.41.0 diff --git a/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch b/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch index d67f233..453effe 100644 --- a/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch +++ b/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch @@ -1,4 +1,4 @@ -From bddeb2a46d7d6e706675c3a4959403825b36fc7b Mon Sep 17 00:00:00 2001 +From a5490ca593e1515bddbc96491efd8d1ff5e372d6 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 14 Feb 2020 06:05:42 -0500 Subject: [PATCH 3/5] Set FreeType version to 2.13.1 and update tolerances @@ -16,7 +16,7 @@ Signed-off-by: Elliott Sales de Andrade 8 files changed, 36 insertions(+), 19 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index 324b9bcabd..133dc73548 100644 +index 26dd9372e1..81b77d455f 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1307,7 +1307,7 @@ def _val_or_rc(val, rc_name): @@ -29,10 +29,10 @@ index 324b9bcabd..133dc73548 100644 from matplotlib import ft2font if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 30992d5780..348181e67f 100644 +index 6c5dd712b7..0a70c37891 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py -@@ -7621,7 +7621,7 @@ def test_normal_axes(): +@@ -7623,7 +7623,7 @@ def test_normal_axes(): ] for nn, b in enumerate(bbaxis): targetbb = mtransforms.Bbox.from_bounds(*target[nn]) @@ -41,7 +41,7 @@ index 30992d5780..348181e67f 100644 target = [ [150.0, 119.999, 930.0, 11.111], -@@ -7639,7 +7639,7 @@ def test_normal_axes(): +@@ -7641,7 +7641,7 @@ def test_normal_axes(): target = [85.5138, 75.88888, 1021.11, 1017.11] targetbb = mtransforms.Bbox.from_bounds(*target) diff --git a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch b/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch index 0f04bd2..8aa0ba0 100644 --- a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch +++ b/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch @@ -1,4 +1,4 @@ -From c564f0d02e2b7c2228eeab9050d8d92209c6a3df Mon Sep 17 00:00:00 2001 +From 88d4c6305161338ecb1f095c92ad7c6920ac5697 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 22 Aug 2022 18:43:28 -0400 Subject: [PATCH 4/5] Use old stride_windows implementation on 32-bit x86 diff --git a/0005-TST-Increase-some-tolerances-for-non-x86-arches.patch b/0005-TST-Increase-some-tolerances-for-non-x86-arches.patch index ab46674..1277dee 100644 --- a/0005-TST-Increase-some-tolerances-for-non-x86-arches.patch +++ b/0005-TST-Increase-some-tolerances-for-non-x86-arches.patch @@ -1,4 +1,4 @@ -From d429c3d4b548a976bc9eac437fca09fdfe784fa8 Mon Sep 17 00:00:00 2001 +From c3b9e1f09d8b061db4810640afb4b92f0cc25aaf Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 11 Aug 2023 05:13:38 -0400 Subject: [PATCH 5/5] TST: Increase some tolerances for non-x86 arches @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py -index 1f8764cbab..c998e929a9 100644 +index 9cebc8a33e..080f17ac81 100644 --- a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py +++ b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py @@ -2249,7 +2249,7 @@ def test_scatter_masked_color(): diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 68e8558..2070e50 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -30,13 +30,13 @@ %global _docdir_fmt %{name} # Updated test images for new FreeType. -%global mpl_images_version 3.8.0 +%global mpl_images_version 3.8.1 # The version of FreeType in this Fedora branch. %global ftver 2.13.1 Name: python-matplotlib -Version: 3.8.0 +Version: 3.8.1 %global Version %{version_no_tilde %{quote:%nil}} Release: %autorelease Summary: Python 2D plotting library diff --git a/sources b/sources index f2ac3c6..4c4e8c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (matplotlib-3.8.0.tar.gz) = 0f75495210946adf0a36af13a75bc9910d345cc05636019952f35856b4c2bfac8a79c48d5a3348e844cfdac797f3ce490fe6a4e1a4fc7033092fee61f9913e21 -SHA512 (matplotlib-3.8.0-with-freetype-2.13.1.tar.gz) = 8ef9ce2915d125b09a31bc692c7af740038bfbb05b4f7e6a03927e0c856fd7e5af2a08d3a6f533d83fe97ec73a7620da3ac0d6f49729162a3b588b51186e2794 +SHA512 (matplotlib-3.8.1.tar.gz) = bb933361caba0f4ea590df56569edf4cb728f1daa1219f8793b5ae6ba591cb5d1600fdd1693b7c72a8bb70b0da696b05f1b6ddcabe93d723f29d8541fbf0372c +SHA512 (matplotlib-3.8.1-with-freetype-2.13.1.tar.gz) = 724802e6e4ecc4c8e36b858da5039a2906a2303b5131780950733eb1965e89fbbce131566b79f533fc1bd185c95e5d50ea3ba24be4ee9b79c073056fe7b3f0dc