Update to 3.7.4

.gitignore

@@ -90,6 +90,8 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-3.6.1-with-freetype-2.12.1.tar.gz
 /matplotlib-3.6.2.tar.gz
 /matplotlib-3.6.3.tar.gz
+/pgf_pdflatex.pdf
+/pgf_rcupdate2.pdf
 /matplotlib-3.7.0rc1.tar.gz
 /matplotlib-3.7.0rc1-with-freetype-2.12.1.tar.gz
 /matplotlib-3.7.0.tar.gz
@@ -98,27 +100,5 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-3.7.1-with-freetype-2.12.1.tar.gz
 /matplotlib-3.7.2.tar.gz
 /matplotlib-3.7.2-with-freetype-2.13.1.tar.gz
-/matplotlib-3.8.0rc1.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
-/matplotlib-3.8.2.tar.gz
-/matplotlib-3.8.3.tar.gz
-/matplotlib-3.8.3-with-freetype-2.13.1.tar.gz
-/matplotlib-3.8.4.tar.gz
-/matplotlib-3.9.0.tar.gz
-/matplotlib-3.9.0-with-freetype-2.13.1.tar.gz
-/matplotlib-3.9.1.tar.gz
-/matplotlib-3.9.1-with-freetype-2.13.1.tar.gz
-/matplotlib-3.9.3.tar.gz
-/matplotlib-3.9.3-with-freetype-2.13.1.tar.gz
-/matplotlib-3.9.4.tar.gz
-/matplotlib-3.10.0.tar.gz
-/matplotlib-3.10.0-with-freetype-2.13.1.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
-/matplotlib-3.10.8.tar.gz
+/matplotlib-3.7.3.tar.gz
+/matplotlib-3.7.4.tar.gz

0001-matplotlibrc-path-search-fix.patch

@@ -1,19 +1,18 @@
-From 3c225cf3905d734a27df25e3a53a904a55f2904e Mon Sep 17 00:00:00 2001
-From: Sandro Tosi <morph@debian.org>
+From 7f525ad4de95f9e9ec90a39498eefd22aadcedda 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/4] matplotlibrc path search fix
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- lib/matplotlib/__init__.py      |  5 ++++-
- lib/matplotlib/backend_tools.py | 16 ++++++++--------
- 2 files changed, 12 insertions(+), 9 deletions(-)
+ lib/matplotlib/__init__.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 2786f9b7b9..64ba02afd6 100644
+index ae68094000..06fb76827d 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -593,7 +593,8 @@ def get_cachedir():
+@@ -570,7 +570,8 @@ def get_cachedir():
  @_logged_cached('matplotlib data path: %s')
  def get_data_path():
      """Return the path to Matplotlib data."""
@@ -23,7 +22,7 @@ index 2786f9b7b9..64ba02afd6 100644
  
  
  def matplotlib_fname():
-@@ -613,6 +614,7 @@ def matplotlib_fname():
+@@ -590,6 +591,7 @@ def matplotlib_fname():
            is not defined)
      - On other platforms,
        - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
@@ -31,7 +30,7 @@ index 2786f9b7b9..64ba02afd6 100644
      - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
        exist.
      """
-@@ -631,6 +633,7 @@ def matplotlib_fname():
+@@ -608,6 +610,7 @@ def matplotlib_fname():
              yield matplotlibrc
              yield os.path.join(matplotlibrc, 'matplotlibrc')
          yield os.path.join(get_configdir(), 'matplotlibrc')
@@ -39,81 +38,6 @@ index 2786f9b7b9..64ba02afd6 100644
          yield os.path.join(get_data_path(), 'matplotlibrc')
  
      for fname in gen_candidates():
-diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
-index 87ed794022..9d80539114 100644
---- a/lib/matplotlib/backend_tools.py
-+++ b/lib/matplotlib/backend_tools.py
-@@ -596,7 +596,7 @@ class ToolHome(ViewsPositionsBase):
-     """Restore the original view limits."""
- 
-     description = 'Reset original view'
--    image = 'mpl-data/images/home'
-+    image = '/usr/share/matplotlib/mpl-data/images/home'
-     default_keymap = property(lambda self: mpl.rcParams['keymap.home'])
-     _on_trigger = 'home'
- 
-@@ -605,7 +605,7 @@ class ToolBack(ViewsPositionsBase):
-     """Move back up the view limits stack."""
- 
-     description = 'Back to previous view'
--    image = 'mpl-data/images/back'
-+    image = '/usr/share/matplotlib/mpl-data/images/back'
-     default_keymap = property(lambda self: mpl.rcParams['keymap.back'])
-     _on_trigger = 'back'
- 
-@@ -614,7 +614,7 @@ class ToolForward(ViewsPositionsBase):
-     """Move forward in the view lim stack."""
- 
-     description = 'Forward to next view'
--    image = 'mpl-data/images/forward'
-+    image = '/usr/share/matplotlib/mpl-data/images/forward'
-     default_keymap = property(lambda self: mpl.rcParams['keymap.forward'])
-     _on_trigger = 'forward'
- 
-@@ -623,14 +623,14 @@ class ConfigureSubplotsBase(ToolBase):
-     """Base tool for the configuration of subplots."""
- 
-     description = 'Configure subplots'
--    image = 'mpl-data/images/subplots'
-+    image = '/usr/share/matplotlib/mpl-data/images/subplots'
- 
- 
- class SaveFigureBase(ToolBase):
-     """Base tool for figure saving."""
- 
-     description = 'Save the figure'
--    image = 'mpl-data/images/filesave'
-+    image = '/usr/share/matplotlib/mpl-data/images/filesave'
-     default_keymap = property(lambda self: mpl.rcParams['keymap.save'])
- 
- 
-@@ -705,7 +705,7 @@ class ToolZoom(ZoomPanBase):
-     """A Tool for zooming using a rectangle selector."""
- 
-     description = 'Zoom to rectangle'
--    image = 'mpl-data/images/zoom_to_rect'
-+    image = '/usr/share/matplotlib/mpl-data/images/zoom_to_rect'
-     default_keymap = property(lambda self: mpl.rcParams['keymap.zoom'])
-     cursor = cursors.SELECT_REGION
-     radio_group = 'default'
-@@ -827,7 +827,7 @@ class ToolPan(ZoomPanBase):
- 
-     default_keymap = property(lambda self: mpl.rcParams['keymap.pan'])
-     description = 'Pan axes with left mouse, zoom with right'
--    image = 'mpl-data/images/move'
-+    image = '/usr/share/matplotlib/mpl-data/images/move'
-     cursor = cursors.MOVE
-     radio_group = 'default'
- 
-@@ -891,7 +891,7 @@ class ToolPan(ZoomPanBase):
- class ToolHelpBase(ToolBase):
-     description = 'Print tool list, shortcuts and description'
-     default_keymap = property(lambda self: mpl.rcParams['keymap.help'])
--    image = 'mpl-data/images/help'
-+    image = '/usr/share/matplotlib/mpl-data/images/help'
- 
-     @staticmethod
-     def format_shortcut(key_sequence):
 -- 
-2.52.0
+2.41.0
 

0002-Don-t-require-oldest-supported-numpy.patch

@@ -0,0 +1,26 @@
+From 4fc7594b7f3eb3a9b8c9b2ea53aa7230cc7305a9 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Thu, 26 Jan 2023 06:40:06 -0500
+Subject: [PATCH 2/4] Don't require oldest-supported-numpy
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index e887bd0975..673981f236 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -2,7 +2,7 @@
+ build-backend = "setuptools.build_meta"
+ requires = [
+     "certifi>=2020.06.20",
+-    "oldest-supported-numpy",
++    "numpy",
+     "pybind11>=2.6",
+     "setuptools>=42",
+     "setuptools_scm>=7",
+-- 
+2.41.0
+

0002-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch

@@ -1,127 +0,0 @@
-From 7b4e2945933049429d00d6f3900d2cdf992c80df 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
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- extern/meson.build                       | 2 +-
- lib/matplotlib/__init__.py               | 2 +-
- lib/matplotlib/tests/test_axes.py        | 4 ++--
- lib/matplotlib/tests/test_backend_pgf.py | 2 +-
- lib/matplotlib/tests/test_ft2font.py     | 6 +++---
- lib/matplotlib/tests/test_legend.py      | 4 ++--
- lib/matplotlib/tests/test_polar.py       | 2 +-
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/extern/meson.build b/extern/meson.build
-index 5463183a90..c7233815af 100644
---- a/extern/meson.build
-+++ b/extern/meson.build
-@@ -13,7 +13,7 @@ else
-   # must match the value in `lib/matplotlib.__init__.py`. Also update the docs
-   # in `docs/devel/dependencies.rst`. Bump the cache key in
-   # `.circleci/config.yml` when changing requirements.
--  LOCAL_FREETYPE_VERSION = '2.6.1'
-+  LOCAL_FREETYPE_VERSION = '2.13.1'
- 
-   freetype_proj = subproject(
-     f'freetype-@LOCAL_FREETYPE_VERSION@',
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 64ba02afd6..9fe5fb7abf 100644
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -1364,7 +1364,7 @@ def _val_or_rc(val, rc_name):
- def _init_tests():
-     # The version of FreeType to install locally for running the tests. This must match
-     # the value in `meson.build`.
--    LOCAL_FREETYPE_VERSION = '2.6.1'
-+    LOCAL_FREETYPE_VERSION = '2.13.1'
- 
-     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 159fc70282..b304186fc9 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -8084,7 +8084,7 @@ def test_normal_axes():
-     ]
-     for nn, b in enumerate(bbaxis):
-         targetbb = mtransforms.Bbox.from_bounds(*target[nn])
--        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
-+        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
- 
-     target = [
-         [150.0, 119.999, 930.0, 11.111],
-@@ -8102,7 +8102,7 @@ def test_normal_axes():
- 
-     target = [85.5138, 75.88888, 1021.11, 1017.11]
-     targetbb = mtransforms.Bbox.from_bounds(*target)
--    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
-+    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
- 
-     # test that get_position roundtrips to get_window_extent
-     axbb = ax.get_position().transformed(fig.transFigure).bounds
-diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
-index e218a81cdc..839ad724e1 100644
---- a/lib/matplotlib/tests/test_backend_pgf.py
-+++ b/lib/matplotlib/tests/test_backend_pgf.py
-@@ -165,7 +165,7 @@ def test_pathclip():
- # test mixed mode rendering
- @needs_pgf_xelatex
- @pytest.mark.backend('pgf')
--@image_comparison(['pgf_mixedmode.pdf'], style='default')
-+@image_comparison(['pgf_mixedmode.pdf'], style='default', tol=0.87)
- def test_mixedmode():
-     mpl.rcParams.update({'font.family': 'serif', 'pgf.rcfonts': False})
-     Y, X = np.ogrid[-1:1:40j, -1:1:40j]
-diff --git a/lib/matplotlib/tests/test_ft2font.py b/lib/matplotlib/tests/test_ft2font.py
-index 6ba23bab34..0aee3222f1 100644
---- a/lib/matplotlib/tests/test_ft2font.py
-+++ b/lib/matplotlib/tests/test_ft2font.py
-@@ -706,10 +706,10 @@ def test_ft2font_get_sfnt_table(font_name, header):
- 
- @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):
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index eb3bfca7c2..c01be3aec0 100644
---- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -520,9 +520,9 @@ def test_figure_legend_outside():
-         fig.draw_without_rendering()
- 
-         assert_allclose(axs.get_window_extent().extents,
--                        axbb[nn])
-+                        axbb[nn], rtol=1)
-         assert_allclose(leg.get_window_extent().extents,
--                        legbb[nn])
-+                        legbb[nn], rtol=1)
- 
- 
- @image_comparison(['legend_stackplot.png'],
-diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
-index 844ab8cf3a..826a8a0c3a 100644
---- a/lib/matplotlib/tests/test_polar.py
-+++ b/lib/matplotlib/tests/test_polar.py
-@@ -328,7 +328,7 @@ def test_get_tightbbox_polar():
-     fig.canvas.draw()
-     bb = ax.get_tightbbox(fig.canvas.get_renderer())
-     assert_allclose(
--        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1e-03)
-+        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1)
- 
- 
- @check_figures_equal(extensions=["png"])
--- 
-2.52.0
-

0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch

@@ -0,0 +1,184 @@
+From 3701d77ac6d708557ccc12dbbfe1ab114d36c319 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 3/4] Set FreeType version to 2.13.1 and update tolerances
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ lib/matplotlib/__init__.py                    |  2 +-
+ lib/matplotlib/tests/test_axes.py             |  4 ++--
+ .../tests/test_constrainedlayout.py           |  8 +++----
+ lib/matplotlib/tests/test_legend.py           |  4 ++--
+ lib/matplotlib/tests/test_polar.py            |  2 +-
+ lib/matplotlib/tests/test_tightlayout.py      | 10 ++++-----
+ setupext.py                                   | 21 +++++++++++++++++--
+ 7 files changed, 34 insertions(+), 17 deletions(-)
+
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index 06fb76827d..0760141c77 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -1288,7 +1288,7 @@ def is_interactive():
+ def _init_tests():
+     # The version of FreeType to install locally for running the
+     # tests.  This must match the value in `setupext.py`
+-    LOCAL_FREETYPE_VERSION = '2.6.1'
++    LOCAL_FREETYPE_VERSION = '2.13.1'
+ 
+     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 cef1c76af6..f1b7a0e884 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -7433,7 +7433,7 @@ def test_normal_axes():
+     ]
+     for nn, b in enumerate(bbaxis):
+         targetbb = mtransforms.Bbox.from_bounds(*target[nn])
+-        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
++        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
+ 
+     target = [
+         [150.0, 119.999, 930.0, 11.111],
+@@ -7451,7 +7451,7 @@ def test_normal_axes():
+ 
+     target = [85.5138, 75.88888, 1021.11, 1017.11]
+     targetbb = mtransforms.Bbox.from_bounds(*target)
+-    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
++    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
+ 
+     # test that get_position roundtrips to get_window_extent
+     axbb = ax.get_position().transformed(fig.transFigure).bounds
+diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
+index ee08c375c7..8d72db556b 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -432,7 +432,7 @@ def test_hidden_axes():
+     extents1 = np.copy(axs[0, 0].get_position().extents)
+ 
+     np.testing.assert_allclose(
+-        extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5)
++        extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2)
+ 
+ 
+ def test_colorbar_align():
+@@ -638,7 +638,7 @@ def test_compressed1():
+     fig.draw_without_rendering()
+ 
+     pos = axs[0, 0].get_position()
+-    np.testing.assert_allclose(pos.x0, 0.2344, atol=1e-3)
++    np.testing.assert_allclose(pos.x0, 0.2344, atol=1e-2)
+     pos = axs[0, 1].get_position()
+     np.testing.assert_allclose(pos.x1, 0.7024, atol=1e-3)
+ 
+@@ -653,10 +653,10 @@ def test_compressed1():
+ 
+     pos = axs[0, 0].get_position()
+     np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
+-    np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3)
++    np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-2)
+     pos = axs[1, 2].get_position()
+     np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3)
+-    np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3)
++    np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-2)
+ 
+ 
+ @pytest.mark.parametrize('arg, state', [
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index a8d7fd107d..cbca9e93e9 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -522,9 +522,9 @@ def test_figure_legend_outside():
+         fig.draw_without_rendering()
+ 
+         assert_allclose(axs.get_window_extent().extents,
+-                        axbb[nn])
++                        axbb[nn], rtol=1)
+         assert_allclose(leg.get_window_extent().extents,
+-                        legbb[nn])
++                        legbb[nn], rtol=1)
+ 
+ 
+ @image_comparison(['legend_stackplot.png'])
+diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
+index 9d6e78da2c..5f6ed538d1 100644
+--- a/lib/matplotlib/tests/test_polar.py
++++ b/lib/matplotlib/tests/test_polar.py
+@@ -321,7 +321,7 @@ def test_get_tightbbox_polar():
+     fig.canvas.draw()
+     bb = ax.get_tightbbox(fig.canvas.get_renderer())
+     assert_allclose(
+-        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1e-03)
++        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1)
+ 
+ 
+ @check_figures_equal(extensions=["png"])
+diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
+index 968f0da7b5..89caa81b98 100644
+--- a/lib/matplotlib/tests/test_tightlayout.py
++++ b/lib/matplotlib/tests/test_tightlayout.py
+@@ -173,12 +173,12 @@ def test_outward_ticks():
+     plt.tight_layout()
+     # These values were obtained after visual checking that they correspond
+     # to a tight layouting that did take the ticks into account.
+-    ans = [[[0.091, 0.607], [0.433, 0.933]],
+-           [[0.579, 0.607], [0.922, 0.933]],
+-           [[0.091, 0.140], [0.433, 0.466]],
+-           [[0.579, 0.140], [0.922, 0.466]]]
++    ans = [[[0.09, 0.61], [0.43, 0.93]],
++           [[0.58, 0.61], [0.92, 0.93]],
++           [[0.09, 0.14], [0.43, 0.47]],
++           [[0.58, 0.14], [0.92, 0.47]]]
+     for nn, ax in enumerate(fig.axes):
+-        assert_array_equal(np.round(ax.get_position().get_points(), 3),
++        assert_array_equal(np.round(ax.get_position().get_points(), 2),
+                            ans[nn])
+ 
+ 
+diff --git a/setupext.py b/setupext.py
+index a898d642d6..b22d875d6f 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -176,13 +176,29 @@ _freetype_hashes = {
+         '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
+     '2.10.1':
+         '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
++    '2.10.2':
++        'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
++    '2.10.3':
++        '9dfb4e11efd6e460a87b1991a64bc69344ee7dc219d9b29e7faabc1c168ce8b0',
++    '2.10.4':
++        '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
++    '2.11.0':
++        'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
+     '2.11.1':
+-        'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b'
++        'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b',
++    '2.12.0':
++        '7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c',
++    '2.12.1':
++        'efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938',
++    '2.13.0':
++        'a7aca0e532a276ea8d85bd31149f0a74c33d19c8d287116ef8f5f8357b4f1f80',
++    '2.13.1':
++        '0b109c59914f25b4411a8de2a506fdd18fa8457eb86eca6c7b15c19110a92fa5',
+ }
+ # This is the version of FreeType to use when building a local version.  It
+ # must match the value in lib/matplotlib.__init__.py, and the cache path in
+ # `.circleci/config.yml`.
+-TESTING_VERSION_OF_FREETYPE = '2.6.1'
++TESTING_VERSION_OF_FREETYPE = '2.13.1'
+ if sys.platform.startswith('win') and platform.machine() == 'ARM64':
+     # older versions of freetype are not supported for win/arm64
+     # Matplotlib tests will not pass
+@@ -597,6 +613,7 @@ class FreeType(SetupPackage):
+             ext.extra_objects.insert(
+                 0, str(src_path / 'objs' / '.libs' / libfreetype))
+             ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
++            ext.libraries.append('brotlidec')
+ 
+     def do_custom_build(self, env):
+         # We're using a system freetype
+-- 
+2.41.0
+

0003-Unpin-meson-python-build-requirement.patch

@@ -1,38 +0,0 @@
-From a05766154a8aa81691f3318b706d286bb87fb1c6 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
-
-This is pinned to fix sdists, but we already have one and are building a
-wheel, which should be fine.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- pyproject.toml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 23c441b52c..f762c85d98 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -48,7 +48,7 @@ requires-python = ">=3.10"
- [project.optional-dependencies]
- # Should be a copy of the build dependencies below.
- dev = [
--    "meson-python>=0.13.1,<0.17.0",
-+    "meson-python>=0.13.1",
-     "pybind11>=2.13.2,!=2.13.3",
-     "setuptools_scm>=7",
-     # Not required by us but setuptools_scm without a version, cso _if_
-@@ -72,7 +72,7 @@ dev = [
- build-backend = "mesonpy"
- # Also keep in sync with optional dependencies above.
- requires = [
--    "meson-python>=0.13.1,<0.17.0",
-+    "meson-python>=0.13.1",
-     "pybind11>=2.13.2,!=2.13.3",
-     "setuptools_scm>=7",
- ]
--- 
-2.52.0
-

0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch

@@ -1,18 +1,18 @@
-From 9522bbb8e713e167581e705dc4f8c4364b05da2d Mon Sep 17 00:00:00 2001
+From 5d12c697908d1103dc7fa2d915ad82d357975709 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/4] Use old stride_windows implementation on 32-bit x86
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- lib/matplotlib/mlab.py | 39 +++++++++++++++++++++++++++++++++++----
- 1 file changed, 35 insertions(+), 4 deletions(-)
+ lib/matplotlib/mlab.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
-index 8326ac186e..bdaa34b734 100644
+index 059cf0f162..943eb18e6f 100644
 --- a/lib/matplotlib/mlab.py
 +++ b/lib/matplotlib/mlab.py
-@@ -49,6 +49,7 @@ Spectral functions
+@@ -52,6 +52,7 @@ Spectral functions
  
  import functools
  from numbers import Number
@@ -20,65 +20,17 @@ index 8326ac186e..bdaa34b734 100644
  
  import numpy as np
  
-@@ -210,6 +211,30 @@ def detrend_linear(y):
-     return y - (b*x + a)
+@@ -252,7 +253,9 @@ def stride_windows(x, n, noverlap=None, axis=0):
  
- 
-+def _stride_windows(x, n, noverlap=0):
-+    if noverlap >= n:
-+        raise ValueError('noverlap must be less than n')
-+    if n < 1:
-+        raise ValueError('n cannot be less than 1')
-+
-+    x = np.asarray(x)
-+
-+    if n == 1 and noverlap == 0:
-+        return x[np.newaxis]
-+    if n > x.size:
-+        raise ValueError('n cannot be greater than the length of x')
-+
-+    # np.lib.stride_tricks.as_strided easily leads to memory corruption for
-+    # non integer shape and strides, i.e. noverlap or n. See #3845.
-+    noverlap = int(noverlap)
-+    n = int(n)
-+
-+    step = n - noverlap
-+    shape = (n, (x.shape[-1]-noverlap)//step)
-+    strides = (x.strides[0], step*x.strides[0])
-+    return np.lib.stride_tricks.as_strided(x, shape=shape, strides=strides)
-+
-+
- def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
-                      window=None, noverlap=None, pad_to=None,
-                      sides=None, scale_by_freq=None, mode=None):
-@@ -304,8 +329,11 @@ def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
-         raise ValueError(
-             "The window length must match the data's first dimension")
- 
--    result = np.lib.stride_tricks.sliding_window_view(
--        x, NFFT, axis=0)[::NFFT - noverlap].T
-+    if sys.maxsize > 2**32:  # NumPy version on 32-bit OOMs.
-+        result = np.lib.stride_tricks.sliding_window_view(
-+            x, NFFT, axis=0)[::NFFT - noverlap].T
-+    else:
-+        result = _stride_windows(x, NFFT, noverlap=noverlap)
-     result = detrend(result, detrend_func, axis=0)
-     result = result * window.reshape((-1, 1))
-     result = np.fft.fft(result, n=pad_to, axis=0)[:numFreqs, :]
-@@ -313,8 +341,11 @@ def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,
- 
-     if not same_data:
-         # if same_data is False, mode must be 'psd'
--        resultY = np.lib.stride_tricks.sliding_window_view(
--            y, NFFT, axis=0)[::NFFT - noverlap].T
-+        if sys.maxsize > 2**32:  # NumPy version on 32-bit OOMs.
-+            resultY = np.lib.stride_tricks.sliding_window_view(
-+                y, NFFT, axis=0)[::NFFT - noverlap].T
-+        else:
-+            resultY = _stride_windows(y, NFFT, noverlap=noverlap)
-         resultY = detrend(resultY, detrend_func, axis=0)
-         resultY = resultY * window.reshape((-1, 1))
-         resultY = np.fft.fft(resultY, n=pad_to, axis=0)[:numFreqs, :]
+ def _stride_windows(x, n, noverlap=0, axis=0):
+     # np>=1.20 provides sliding_window_view, and we only ever use axis=0.
+-    if hasattr(np.lib.stride_tricks, "sliding_window_view") and axis == 0:
++    if (sys.maxsize > 2**32 and  # NumPy version on 32-bit OOMs.
++            hasattr(np.lib.stride_tricks, "sliding_window_view") and
++            axis == 0):
+         if noverlap >= n:
+             raise ValueError('noverlap must be less than n')
+         return np.lib.stride_tricks.sliding_window_view(
 -- 
-2.52.0
+2.41.0
 

0005-Partially-revert-TST-Fix-minor-issues-in-interactive.patch

@@ -1,32 +0,0 @@
-From 5944097c27a6b65168a0287daeb9f7f9b8f9f7f3 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
- backend test (#28838)"
-
-This reverts commit 7c7f94c5f71e99f148255e3bb570fec25c8fe754.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/matplotlib/tests/test_backends_interactive.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
-index 4e3c1bbc2b..cb8c458d0d 100644
---- a/lib/matplotlib/tests/test_backends_interactive.py
-+++ b/lib/matplotlib/tests/test_backends_interactive.py
-@@ -232,7 +232,10 @@ def _test_interactive_impl():
-     result_after = io.BytesIO()
-     fig.savefig(result_after, format='png')
- 
--    assert result.getvalue() == result_after.getvalue()
-+    if 'qt' not in backend and 'wx' not in backend and 'gtk4' not in backend:
-+        # FIXME: This should be enabled everywhere once Qt5 is fixed on macOS
-+        # to not resize incorrectly.
-+        assert result.getvalue() == result_after.getvalue()
- 
- 
- @pytest.mark.parametrize("env", _get_testable_interactive_backends())
--- 
-2.52.0
-

changelog

@@ -1,6 +1,3 @@
-* Fri Aug 11 2023 Tom Callaway <spot@fedoraproject.org> - 3.7.2-2
-- rebuild for new qhull
-
 * Mon Aug 09 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.2-5
 - Update test images for FreeType 2.11.0
 - Backport patch for NumPy 1.21

mplsetup.cfg

@@ -0,0 +1,8 @@
+[libs]
+system_freetype = True
+system_qhull = True
+
+[packages]
+tests = True
+toolkits = True
+toolkits_tests = True

python-matplotlib.spec

@@ -10,8 +10,8 @@
 %bcond_without wx
 %endif
 
-# The default backend; one of GTK3Agg GTK3Cairo GTK4Agg GTK4Cairo MacOSX QtAgg
-# TkAgg WXAgg Agg Cairo PS PDF SVG
+# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
+# WXAgg Agg Cairo PS PDF SVG
 %global backend                 TkAgg
 
 %if "%{backend}" == "TkAgg"
@@ -26,27 +26,26 @@
 %  endif
 %endif
 
-%global build_backend_args -Csetup-args="-Dsystem-freetype=true" -Csetup-args="-Dsystem-qhull=true" -Cinstall-args="--tags=data,python-runtime,runtime,tests"
-
 # Use the same directory of the main package for subpackage licence and docs
 %global _docdir_fmt %{name}
 
 # Updated test images for new FreeType.
-%global mpl_images_version 3.10.3
+%global mpl_images_version 3.7.2
 
 # The version of FreeType in this Fedora branch.
 %global ftver 2.13.1
 
 Name:           python-matplotlib
-Version:        3.10.8
-%global Version %{version_no_tilde %{quote:%nil}}
+Version:        3.7.4
+%global Version 3.7.4
 Release:        %autorelease
 Summary:        Python 2D plotting library
 # qt_editor backend is MIT
 # ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is CC0
-License:        PSF-2.0 AND MIT AND CC0-1.0
+License:        PSF-2.0 and MIT and CC0-1.0
 URL:            https://matplotlib.org
 Source0:        %pypi_source matplotlib %{Version}
+Source1:        mplsetup.cfg
 
 # Fedora-specific patches; see:
 # https://github.com/fedora-python/matplotlib/tree/fedora-patches
@@ -54,42 +53,33 @@ Source0:        %pypi_source matplotlib %{Version}
 Source1000:     https://github.com/QuLogic/mpl-images/archive/v%{mpl_images_version}-with-freetype-%{ftver}/matplotlib-%{mpl_images_version}-with-freetype-%{ftver}.tar.gz
 # Search in /etc/matplotlibrc:
 Patch1001:      0001-matplotlibrc-path-search-fix.patch
+Patch1002:      0002-Don-t-require-oldest-supported-numpy.patch
 # Increase tolerances for new FreeType everywhere:
-Patch1002:      0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
-# We don't need to use older meson-python.
-Patch1003:      0003-Unpin-meson-python-build-requirement.patch
+Patch1003:      0003-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
 
 # https://github.com/matplotlib/matplotlib/pull/21190#issuecomment-1223271888
 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
-
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-langpack-en
 BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  qhull-devel
-%ifnarch %{ix86}
-BuildRequires:  xwayland-run
-%endif
+BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  zlib-devel
 
-%ifnarch %{ix86}
 BuildRequires:  ghostscript
 # No ImageMagick for EL8/ELN/EL9
 %if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} < 8)
 BuildRequires:  ImageMagick
 %endif
 BuildRequires:  inkscape
-%endif
 
 BuildRequires:  font(dejavusans)
 BuildRequires:  font(notosanscjkjp)
 BuildRequires:  font(wenquanyizenhei)
 
-%ifnarch %{ix86}
 BuildRequires:  texlive-collection-basic
 BuildRequires:  texlive-collection-fontsrecommended
 BuildRequires:  texlive-collection-latex
@@ -138,7 +128,6 @@ BuildRequires:  tex(cmr10.tfm)
 BuildRequires:  tex(cmss10.tfm)
 BuildRequires:  tex(cmsy10.tfm)
 BuildRequires:  tex(cmtt10.tfm)
-%endif
 
 %description
 Matplotlib is a Python 2D plotting library which produces publication
@@ -167,7 +156,7 @@ Obsoletes:      python-matplotlib-data < 3
 Summary:        Fonts used by python-matplotlib
 # Carlogo, STIX and Computer Modern is OFL
 # DejaVu is Bitstream Vera and Public Domain
-License:        OFL-1.1 AND Bitstream-Vera AND LicenseRef-Fedora-Public-Domain
+License:        OFL-1.1 and Bitstream-Vera and LicenseRef-Fedora-Public-Domain
 BuildArch:      noarch
 Requires:       python3-matplotlib-data = %{version}-%{release}
 Obsoletes:      python-matplotlib-data-fonts < 3
@@ -179,9 +168,7 @@ Obsoletes:      python-matplotlib-data-fonts < 3
 %package -n     python3-matplotlib
 Summary:        Python 2D plotting library
 BuildRequires:  python3-devel
-%ifnarch %{ix86}
 BuildRequires:  python3dist(pycairo)
-%endif
 BuildRequires:  python3dist(pytz)
 BuildRequires:  python3dist(sphinx)
 Requires:       dejavu-sans-fonts
@@ -189,16 +176,14 @@ Recommends:     texlive-dvipng
 Requires:       (texlive-dvipng if texlive-base)
 Requires:       python3-matplotlib-data = %{version}-%{release}
 Requires:       python3dist(pycairo)
-Recommends:     python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
+Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
 %if %{with check}
 BuildRequires:  python3dist(pytest)
 BuildRequires:  python3dist(pytest-rerunfailures)
 BuildRequires:  python3dist(pytest-timeout)
 BuildRequires:  python3dist(pytest-xdist)
-%ifnarch %{ix86}
 BuildRequires:  python3dist(pikepdf)
 %endif
-%endif
 %if %{without bundled_fonts}
 Requires:       stix-math-fonts
 %else
@@ -219,10 +204,7 @@ errorcharts, scatterplots, etc, with just a few lines of code.
 %package -n     python3-matplotlib-qt5
 Summary:        Qt5 backend for python3-matplotlib
 BuildRequires:  python3dist(cairocffi)
-%ifnarch %{ix86}
 BuildRequires:  python3dist(pyqt5)
-BuildRequires:  qt5-qtwayland
-%endif
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3dist(cairocffi)
 Requires:       python3dist(pyqt5)
@@ -234,11 +216,7 @@ Obsoletes:      python3-matplotlib-qt4 < 3.5.0-0
 %package -n     python3-matplotlib-qt6
 Summary:        Qt6 backend for python3-matplotlib
 BuildRequires:  python3dist(cairocffi)
-%ifnarch %{ix86}
 BuildRequires:  python3dist(pyqt6)
-BuildRequires:  python3-pyqt6
-BuildRequires:  qt6-qtwayland
-%endif
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3dist(cairocffi)
 Requires:       python3dist(pyqt6)
@@ -248,11 +226,9 @@ Requires:       python3dist(pyqt6)
 
 %package -n     python3-matplotlib-gtk3
 Summary:        GTK3 backend for python3-matplotlib
-%ifnarch %{ix86}
 # This should be converted to typelib(Gtk) when supported
 BuildRequires:  gtk3
 BuildRequires:  python3-gobject
-%endif
 Requires:       gtk3%{?_isa}
 Requires:       python3-gobject%{?_isa}
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
@@ -262,11 +238,9 @@ Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 
 %package -n     python3-matplotlib-gtk4
 Summary:        GTK4 backend for python3-matplotlib
-%ifnarch %{ix86}
 # This should be converted to typelib(Gtk) when supported
 BuildRequires:  gtk4
 BuildRequires:  python3-gobject
-%endif
 Requires:       gtk4%{?_isa}
 Requires:       python3-gobject%{?_isa}
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
@@ -276,10 +250,8 @@ Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 
 %package -n     python3-matplotlib-tk
 Summary:        Tk backend for python3-matplotlib
-%ifnarch %{ix86}
 BuildRequires:  python3-pillow-tk
 BuildRequires:  python3-tkinter
-%endif
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3-pillow-tk
 Requires:       python3-tkinter
@@ -290,9 +262,7 @@ Requires:       python3-tkinter
 %if %{with wx}
 %package -n     python3-matplotlib-wx
 Summary:        WX backend for python3-matplotlib
-%ifnarch %{ix86}
 BuildRequires:  python3dist(wxpython)
-%endif
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3dist(wxpython)
 
@@ -308,7 +278,6 @@ BuildRequires:  make
 BuildRequires:  python3dist(sphinx)
 BuildRequires:  tex(latex)
 BuildRequires:  tex-preview
-BuildRequires:  ipython
 %endif
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 
@@ -331,19 +300,22 @@ Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 # Updated test images for new FreeType.
 gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/~~'
 
+# Copy mplsetup.cfg to the builddir
+cp -p %{SOURCE1} mplsetup.cfg
+
 # Backports or reported upstream
 %autopatch -p1 -M 999
 
 
 %generate_buildrequires
-%pyproject_buildrequires -p
+%pyproject_buildrequires -r
 
 
 %build
 %set_build_flags
 export http_proxy=http://127.0.0.1/
 
-MPLCONFIGDIR=$PWD %pyproject_wheel %build_backend_args
+MPLCONFIGDIR=$PWD %pyproject_wheel
 %if %{with html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 MPLCONFIGDIR=$PWD \
@@ -352,7 +324,7 @@ PYTHONPATH="%{pyproject_site_lib}" \
 %endif
 # Ensure all example files are non-executable so that the -doc
 # package doesn't drag in dependencies
-find galleries -name '*.py' -exec chmod a-x '{}' \;
+find examples -name '*.py' -exec chmod a-x '{}' \;
 
 
 %install
@@ -361,6 +333,7 @@ export http_proxy=http://127.0.0.1/
 MPLCONFIGDIR=$PWD %pyproject_install
 
 # Delete unnecessary files.
+rm %{buildroot}%{python3_sitearch}/matplotlib/backends/web_backend/.{eslintrc.js,prettierignore,prettierrc}
 rm %{buildroot}%{python3_sitearch}/matplotlib/tests/tinypages/.gitignore
 rm %{buildroot}%{python3_sitearch}/matplotlib/tests/tinypages/_static/.gitignore
 
@@ -378,43 +351,26 @@ rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
 # These files confuse pytest, and we want to test the installed copy.
 rm -rf build*/
 
-%ifnarch %{ix86}
 # We need to prime this LaTeX cache stuff, or it might fail while running tests
 # in parallel.
 mktexfmt latex.fmt
 mktexfmt lualatex.fmt
 mktexfmt pdflatex.fmt
 mktexfmt xelatex.fmt
-%endif
-# Also prime the font cache.
-%{py3_test_envvars} %{python3} -c 'import matplotlib.font_manager'
 
 export http_proxy=http://127.0.0.1/
-
-# This test checks for "slowness" that often fails on a heavily-loaded builder.
-k="${k-}${k+ and }not test_invisible_Line_rendering"
-# This test is flaky.
-k="${k-}${k+ and }not test_form_widget_get_with_datetime_and_date_fields"
-
-env MPLCONFIGDIR=$PWD \
-    %{pytest} -ra -n auto \
-         -m 'not network' -k "${k-}" \
-         --pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d
+# Skips:
+#  * test_invisible_Line_rendering: Checks for "slowness" that often fails on a
+#    heavily-loaded builder.
+#  * test_form_widget_get_with_datetime_and_date_fields is flaky.
+MPLCONFIGDIR=$PWD \
 %ifnarch %{ix86}
-# Skip GTK3Cairo tests that are broken in virtual display.
-k="${k-}${k+ and }not (test_interactive_thread_safety and gtk3cairo)"
-k="${k-}${k+ and }not (test_interactive_timers and gtk3cairo)"
-# Run backend tests with Wayland.
-wlheadless-run -- env MPLCONFIGDIR=$PWD GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland \
-    %{pytest} -vra -n auto \
-         -m 'not network' -k "${k-}" \
-         --pyargs matplotlib.tests.test_backend_gtk3 matplotlib.tests.test_backend_qt matplotlib.tests.test_backend_tk matplotlib.tests.test_backends_interactive
-# Run backend tests with XWayland.
-xwfb-run -- env MPLCONFIGDIR=$PWD \
-    %{pytest} -ra -n auto \
-        -m 'not network' -k "${k-}" \
-        --pyargs matplotlib.tests.test_backend_gtk3 matplotlib.tests.test_backend_qt matplotlib.tests.test_backend_tk matplotlib.tests.test_backends_interactive
+     xvfb-run -a -s "-screen 0 640x480x24" \
 %endif
+         env %{pytest} -ra -n auto \
+             -m 'not network' \
+             -k 'not test_invisible_Line_rendering and not test_form_widget_get_with_datetime_and_date_fields' \
+             --pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d
 %endif
 
 
@@ -430,7 +386,7 @@ xwfb-run -- env MPLCONFIGDIR=$PWD \
 %endif
 
 %files -n python3-matplotlib-doc
-%doc galleries/examples
+%doc examples
 %if %{with html}
 %doc doc/build/html/*
 %endif
@@ -439,6 +395,7 @@ xwfb-run -- env MPLCONFIGDIR=$PWD \
 %license LICENSE/
 %doc README.md
 %{python3_sitearch}/matplotlib-*.dist-info/
+%{python3_sitearch}/matplotlib-*-nspkg.pth
 %{python3_sitearch}/matplotlib/
 %exclude %{python3_sitearch}/matplotlib/tests/baseline_images/*
 %{python3_sitearch}/mpl_toolkits/

sources

@@ -1,2 +1,2 @@
-SHA512 (matplotlib-3.10.8.tar.gz) = 66d07fb0b13821e88f6e6fe9f9882542340c074198dce7d5f8bf5d65d1c64326ae7517ad38d6357491c54aedd8cd1b03f555ad6d9337754db5dbd43c6305ab3f
-SHA512 (matplotlib-3.10.3-with-freetype-2.13.1.tar.gz) = bb32e57bbd341c652d03361e3785145a9e89f59709eb588882f81cba4061c8aa7250c0d46ed07a588d75a055d72bbc6126c59e8777634385a458287f6ef8812f
+SHA512 (matplotlib-3.7.4.tar.gz) = 65c17babc7535aa6bdf9ab3db23681411e66dfba840065ae30c56a212ba472da0d189ddb50f7000adb44e579f04d33f1bf572a0a3c50beea6241e138c17a7669
+SHA512 (matplotlib-3.7.2-with-freetype-2.13.1.tar.gz) = 1a8bdaa0b6b3ec3d310aff96c04c99d9350534992592d8d3c99530ef63aa8a4289c5195a791139b9d69b8472eb010ee3d8a248fa8e8dc3941403387321db6e14