Update to latest version (#2385842)

This commit is contained in:
Elliott Sales de Andrade
2025-08-30 02:28:24 -04:00
parent d0eaec2e00
commit f2d972fa1d
9 changed files with 56 additions and 13 deletions
+1
View File
@@ -120,3 +120,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
/matplotlib-3.10.3.tar.gz
/matplotlib-3.10.3-with-freetype-2.13.1.tar.gz
/matplotlib-3.10.5.tar.gz
/matplotlib-3.10.6.tar.gz
+2 -2
View File
@@ -1,7 +1,7 @@
From d9bf585079e97559515c0f0b70b8af387170d90c Mon Sep 17 00:00:00 2001
From ed6c1cf2cf5ca2cb2f509b9a8368e44bac9f6d65 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 27 Sep 2017 19:35:59 -0400
Subject: [PATCH 1/5] matplotlibrc path search fix
Subject: [PATCH 1/6] matplotlibrc path search fix
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@@ -1,7 +1,7 @@
From a415a445094b4424f477b4c7ba25692c9cdb3934 Mon Sep 17 00:00:00 2001
From d0b60f84a490052a1a35fdc0ea850ccb3db1e140 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 14 Feb 2020 06:05:42 -0500
Subject: [PATCH 2/5] Set FreeType version to 2.13.1 and update tolerances
Subject: [PATCH 2/6] Set FreeType version to 2.13.1 and update tolerances
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@@ -1,7 +1,7 @@
From e4623131cd1c151d3f65aba0e1f45e210787c753 Mon Sep 17 00:00:00 2001
From 416cea131ba808a8f92362e472df2861a284f527 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 13 Dec 2024 02:03:33 -0500
Subject: [PATCH 3/5] Unpin meson-python build requirement
Subject: [PATCH 3/6] Unpin meson-python build requirement
This is pinned to fix sdists, but we already have one and are building a
wheel, which should be fine.
@@ -12,7 +12,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 5666016f05..2cd1e1c758 100644
index e6d1abaf53..76755eec25 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -47,7 +47,7 @@ requires-python = ">=3.10"
@@ -1,7 +1,7 @@
From 2e548abc2a98eb8744ba4b66f309151eb483158d Mon Sep 17 00:00:00 2001
From 376aa273a2df3b3937cc2f5124d9db1d0aef3945 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Mon, 22 Aug 2022 18:43:28 -0400
Subject: [PATCH 4/5] Use old stride_windows implementation on 32-bit x86
Subject: [PATCH 4/6] Use old stride_windows implementation on 32-bit x86
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
@@ -1,7 +1,7 @@
From 2b34c246cceea392ecc63d56d9c5395268734eba Mon Sep 17 00:00:00 2001
From fc49cee6c821e5ff1cdbbc3d10e0e5f115685f54 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 12 Nov 2024 01:05:25 -0500
Subject: [PATCH 5/5] Partially revert "TST: Fix minor issues in interactive
Subject: [PATCH 5/6] Partially revert "TST: Fix minor issues in interactive
backend test (#28838)"
This reverts commit 7c7f94c5f71e99f148255e3bb570fec25c8fe754.
@@ -0,0 +1,39 @@
From ee0bc9da534fb143c3bb1690dd45ced01df7def4 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 29 Aug 2025 23:58:54 -0400
Subject: [PATCH 6/6] TST: Use a temporary directory for
test_save_figure_return
This avoids having to manually clean up the resulting file, which seems
flaky.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/tests/test_backend_qt.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
index 962f5ce942..e191dd73eb 100644
--- a/lib/matplotlib/tests/test_backend_qt.py
+++ b/lib/matplotlib/tests/test_backend_qt.py
@@ -219,14 +219,15 @@ def test_figureoptions():
@pytest.mark.backend('QtAgg', skip_on_importerror=True)
-def test_save_figure_return():
+def test_save_figure_return(tmp_path):
+ os.chdir(tmp_path)
fig, ax = plt.subplots()
ax.imshow([[1]])
prop = "matplotlib.backends.qt_compat.QtWidgets.QFileDialog.getSaveFileName"
with mock.patch(prop, return_value=("foobar.png", None)):
fname = fig.canvas.manager.toolbar.save_figure()
- os.remove("foobar.png")
assert fname == "foobar.png"
+ assert (tmp_path / "foobar.png").exists()
with mock.patch(prop, return_value=(None, None)):
fname = fig.canvas.manager.toolbar.save_figure()
assert fname is None
--
2.50.0
+4 -1
View File
@@ -38,7 +38,7 @@
%global ftver 2.13.1
Name: python-matplotlib
Version: 3.10.5
Version: 3.10.6
%global Version %{version_no_tilde %{quote:%nil}}
Release: %autorelease
Summary: Python 2D plotting library
@@ -65,6 +65,9 @@ Patch0001: 0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch
# Temporary fix for some tests.
Patch0002: 0005-Partially-revert-TST-Fix-minor-issues-in-interactive.patch
# https://github.com/matplotlib/matplotlib/pull/30497
Patch0003: 0006-TST-Use-a-temporary-directory-for-test_save_figure_r.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: glibc-langpack-en
+1 -1
View File
@@ -1,2 +1,2 @@
SHA512 (matplotlib-3.10.5.tar.gz) = 761388d0aad410b80179b3bb97d63b6a99d71338a0eb8801702f4a38f4a1a0fdecd8fbb6401e664d2f30a0256f412167c7c102fc494664c1837495572ebf3caa
SHA512 (matplotlib-3.10.6.tar.gz) = c12686d52229bbbd3c16fa5b1d633a7a6eec8e9bae58221554dc3d9595ceae05f985ebb3207425ad2e134e4dae671f590225b1d692b66c2099dd78da13cc6332
SHA512 (matplotlib-3.10.3-with-freetype-2.13.1.tar.gz) = bb32e57bbd341c652d03361e3785145a9e89f59709eb588882f81cba4061c8aa7250c0d46ed07a588d75a055d72bbc6126c59e8777634385a458287f6ef8812f