3.9.1-0, again

-  temporarily (or is it?) remove qt5 sub-package. Will epel10 get qt5?
-  temporarily remove test w/ xvfb-run until I can figure out the
   proper replacement.
-  inkscape seems to not be needed. Or am I wrong about that? It builds
   without it as a BR. Will add it back when inkscape is built for EPEL10.

.gitignore

@@ -80,3 +80,35 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-3.5.3.tar.gz
 /matplotlib-3.5.3-with-freetype-2.11.0.tar.gz
 /matplotlib-3.5.3-with-freetype-2.12.1.tar.gz
+/matplotlib-3.6.0rc1.tar.gz
+/matplotlib-3.6.0rc1-with-freetype-2.12.1.tar.gz
+/matplotlib-3.6.0rc2.tar.gz
+/matplotlib-3.6.0rc2-with-freetype-2.12.1.tar.gz
+/matplotlib-3.6.0.tar.gz
+/matplotlib-3.6.0-with-freetype-2.12.1.tar.gz
+/matplotlib-3.6.1.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
+/matplotlib-3.7.0rc1.tar.gz
+/matplotlib-3.7.0rc1-with-freetype-2.12.1.tar.gz
+/matplotlib-3.7.0.tar.gz
+/matplotlib-3.7.0-with-freetype-2.12.1.tar.gz
+/matplotlib-3.7.1.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

0001-matplotlibrc-path-search-fix.patch

@@ -1,7 +1,7 @@
-From a2d7ef7b895d3b0bc9654d31c6cb40935eec0ce9 Mon Sep 17 00:00:00 2001
+From 7aa7b4d240236c0660be400a7a9ef7d5837e6d47 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/3] matplotlibrc path search fix
+Subject: [PATCH 1/4] matplotlibrc path search fix
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index b8fd4f9860..23841c8377 100644
+index 9e9325a27d..346e3d3454 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -526,7 +526,8 @@ def get_cachedir():
+@@ -586,7 +586,8 @@ def get_cachedir():
  @_logged_cached('matplotlib data path: %s')
  def get_data_path():
      """Return the path to Matplotlib data."""
@@ -22,7 +22,7 @@ index b8fd4f9860..23841c8377 100644
  
  
  def matplotlib_fname():
-@@ -546,6 +547,7 @@ def matplotlib_fname():
+@@ -606,6 +607,7 @@ def matplotlib_fname():
            is not defined)
      - On other platforms,
        - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
@@ -30,7 +30,7 @@ index b8fd4f9860..23841c8377 100644
      - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
        exist.
      """
-@@ -564,6 +566,7 @@ def matplotlib_fname():
+@@ -624,6 +626,7 @@ def matplotlib_fname():
              yield matplotlibrc
              yield os.path.join(matplotlibrc, 'matplotlibrc')
          yield os.path.join(get_configdir(), 'matplotlibrc')
@@ -39,5 +39,5 @@ index b8fd4f9860..23841c8377 100644
  
      for fname in gen_candidates():
 -- 
-2.36.1
+2.44.0
 

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

@@ -1,172 +0,0 @@
-From 70e97e4ede29ccc16bad1d329d08b27d753a8f00 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/3] Set FreeType version to 2.12.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 ++--
- lib/matplotlib/tests/test_constrainedlayout.py |  2 +-
- lib/matplotlib/tests/test_mathtext.py          |  7 +++++--
- lib/matplotlib/tests/test_polar.py             |  2 +-
- lib/matplotlib/tests/test_tightlayout.py       | 10 +++++-----
- setupext.py                                    | 15 +++++++++++++--
- 7 files changed, 28 insertions(+), 14 deletions(-)
-
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 23841c8377..f7f76cbae6 100644
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -1203,7 +1203,7 @@ default_test_modules = [
- 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.12.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 3bd3fecac3..f0b247a7bb 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -6732,7 +6732,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],
-@@ -6750,7 +6750,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 8fd3cc5a35..b1e0fa57cd 100644
---- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -431,7 +431,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():
-diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
-index 6921a17980..ba0e2a3a6c 100644
---- a/lib/matplotlib/tests/test_mathtext.py
-+++ b/lib/matplotlib/tests/test_mathtext.py
-@@ -1,5 +1,6 @@
- import io
- from pathlib import Path
-+import platform
- import re
- import shlex
- from xml.etree import ElementTree as ET
-@@ -192,7 +193,8 @@ def baseline_images(request, fontset, index, text):
- @pytest.mark.parametrize(
-     'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
- @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
--@image_comparison(baseline_images=None)
-+@image_comparison(baseline_images=None,
-+                  tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
- def test_mathtext_rendering(baseline_images, fontset, index, text):
-     mpl.rcParams['mathtext.fontset'] = fontset
-     fig = plt.figure(figsize=(5.25, 0.75))
-@@ -216,7 +218,8 @@ def test_mathtext_rendering_lightweight(baseline_images, fontset, index, text):
- @pytest.mark.parametrize(
-     'fontset', ['cm', 'stix', 'stixsans', 'dejavusans', 'dejavuserif'])
- @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
--@image_comparison(baseline_images=None, extensions=['png'])
-+@image_comparison(baseline_images=None, extensions=['png'],
-+                  tol=0.011 if platform.machine() in ('ppc64le', 's390x') else 0)
- def test_mathfont_rendering(baseline_images, fontset, index, text):
-     mpl.rcParams['mathtext.fontset'] = fontset
-     fig = plt.figure(figsize=(5.25, 0.75))
-diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
-index 85aece5fce..9fea856af4 100644
---- a/lib/matplotlib/tests/test_polar.py
-+++ b/lib/matplotlib/tests/test_polar.py
-@@ -314,7 +314,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 e9b01b160d..beab853489 100644
---- a/lib/matplotlib/tests/test_tightlayout.py
-+++ b/lib/matplotlib/tests/test_tightlayout.py
-@@ -172,12 +172,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 ae8c21599f..abd01d8813 100644
---- a/setupext.py
-+++ b/setupext.py
-@@ -167,14 +167,24 @@ _freetype_hashes = {
-         '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
-     '2.10.1':
-         '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
-+    '2.10.2':
-+        'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
-+    '2.10.4':
-+        '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
-+    '2.11.0':
-+        'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
-     '2.11.1':
--        'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b'
-+        'f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b',
-+    '2.12.0':
-+        '7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c',
-+    '2.12.1':
-+        'efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938',
- }
- # This is the version of FreeType to use when building a local version.  It
- # must match the value in lib/matplotlib.__init__.py and also needs to be
- # changed below in the embedded windows build script (grep for "REMINDER" in
- # this file). Also update the cache path in `.circleci/config.yml`.
--TESTING_VERSION_OF_FREETYPE = '2.6.1'
-+TESTING_VERSION_OF_FREETYPE = '2.12.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
-@@ -593,6 +603,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.36.1
-

0002-Unpin-NumPy-build-requirement.patch

@@ -0,0 +1,41 @@
+From 6caae8127c121be0ad36e0e7b47518519543dffd Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Fri, 11 Aug 2023 02:36:06 -0400
+Subject: [PATCH 2/4] Unpin NumPy build requirement
+
+This is so high simply to take advantage of the new
+backwards-compatibility guarantee in NumPy 1.25, but Fedora will never
+run against a version different from the one it was built against.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ pyproject.toml | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index fe75b325dc..4c34fa395f 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -75,18 +75,7 @@ requires = [
+     "meson-python>=0.13.1",
+     "pybind11>=2.6",
+     "setuptools_scm>=7",
+-
+-    # Comments on numpy build requirement range:
+-    #
+-    #   1. >=2.0.x is the numpy requirement for wheel builds for distribution
+-    #      on PyPI - building against 2.x yields wheels that are also
+-    #      ABI-compatible with numpy 1.x at runtime.
+-    #   2. Note that building against numpy 1.x works fine too - users and
+-    #      redistributors can do this by installing the numpy version they like
+-    #      and disabling build isolation.
+-    #   3. The <2.3 upper bound is for matching the numpy deprecation policy,
+-    #      it should not be loosened.
+-    "numpy>=2.0.0rc1,<2.3",
++    "numpy",
+ ]
+ 
+ [tool.meson-python.args]
+-- 
+2.44.0
+

0003-Increase-a-few-test-tolerances-on-some-arches.patch

@@ -1,127 +0,0 @@
-From 5fcd96777ede1f29bc3f749d12152879a4d67fdf Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Tue, 24 Aug 2021 04:47:50 -0400
-Subject: [PATCH 3/3] Increase a few test tolerances on some arches.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/matplotlib/tests/test_axes.py       | 6 ++++--
- lib/matplotlib/tests/test_colorbar.py   | 5 ++++-
- lib/matplotlib/tests/test_contour.py    | 3 ++-
- lib/matplotlib/tests/test_image.py      | 4 ++--
- lib/matplotlib/tests/test_lines.py      | 4 +++-
- lib/matplotlib/tests/test_streamplot.py | 3 ++-
- 6 files changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index f0b247a7bb..0a025bb6c7 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -918,7 +918,8 @@ def test_imshow():
-     ax.imshow("r", data=data)
- 
- 
--@image_comparison(['imshow_clip'], style='mpl20')
-+@image_comparison(['imshow_clip'], style='mpl20',
-+                  tol=0 if platform.machine() == 'x86_64' else 1.24)
- def test_imshow_clip():
-     # As originally reported by Gellule Xg <gellule.xg@free.fr>
-     # use former defaults to match existing baseline image
-@@ -2127,7 +2128,8 @@ def test_contour_hatching():
-                 extend='both', alpha=0.5)
- 
- 
--@image_comparison(['contour_colorbar'], style='mpl20')
-+@image_comparison(['contour_colorbar'], style='mpl20',
-+                  tol=0 if platform.machine() == 'x86_64' else 0.02)
- def test_contour_colorbar():
-     x, y, z = contour_dat()
- 
-diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
-index f103fde7ee..920f392fc5 100644
---- a/lib/matplotlib/tests/test_colorbar.py
-+++ b/lib/matplotlib/tests/test_colorbar.py
-@@ -1,3 +1,5 @@
-+import platform
-+
- import numpy as np
- import pytest
- 
-@@ -230,7 +232,8 @@ def test_colorbar_single_ax_panchor_east(constrained):
-     assert ax.get_anchor() == 'E'
- 
- 
--@image_comparison(['contour_colorbar.png'], remove_text=True)
-+@image_comparison(['contour_colorbar.png'], remove_text=True,
-+                  tol=0 if platform.machine() == 'x86_64' else 0.01)
- def test_contour_colorbar():
-     fig, ax = plt.subplots(figsize=(4, 2))
-     data = np.arange(1200).reshape(30, 40) - 500
-diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index f4854db502..c4f0a2a31d 100644
---- a/lib/matplotlib/tests/test_contour.py
-+++ b/lib/matplotlib/tests/test_contour.py
-@@ -345,7 +345,8 @@ def test_contourf_log_extension():
- 
- 
- @image_comparison(['contour_addlines.png'],
--                  remove_text=True, style='mpl20', tol=0.03)
-+                  remove_text=True, style='mpl20',
-+                  tol=0.03 if platform.machine() == 'x86_64' else 0.15)
- # tolerance is because image changed minutely when tick finding on
- # colorbars was cleaned up...
- def test_contour_addlines():
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index ae02a50727..15f843fd42 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -1329,8 +1329,8 @@ def test_nonuniform_and_pcolor():
-         ax.set(xlim=(0, 10))
- 
- 
--@image_comparison(["rgba_antialias.png"], style="mpl20",
--                  remove_text=True)
-+@image_comparison(["rgba_antialias.png"], style="mpl20", remove_text=True,
-+                  tol=0 if platform.machine() == 'x86_64' else 0.007)
- def test_rgba_antialias():
-     fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
-                             sharey=False, constrained_layout=True)
-diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
-index f6917a134b..a7b5772e8c 100644
---- a/lib/matplotlib/tests/test_lines.py
-+++ b/lib/matplotlib/tests/test_lines.py
-@@ -3,6 +3,7 @@ Tests specific to the lines module.
- """
- 
- import itertools
-+import platform
- import timeit
- from types import SimpleNamespace
- 
-@@ -162,7 +163,8 @@ def test_set_drawstyle():
-     assert len(line.get_path().vertices) == len(x)
- 
- 
--@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20')
-+@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20',
-+                  tol=0 if platform.machine() == 'x86_64' else 0.62)
- def test_set_line_coll_dash_image():
-     fig, ax = plt.subplots()
-     np.random.seed(0)
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index c8824feb06..879d43f28b 100644
---- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -34,7 +34,8 @@ def test_startpoints():
-     plt.plot(start_x, start_y, 'ok')
- 
- 
--@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20')
-+@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20',
-+                  tol=0.01)
- def test_colormap():
-     X, Y, U, V = velocity_field()
-     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
--- 
-2.36.1
-

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

@@ -0,0 +1,171 @@
+From d2ce17b7096e9f83f9ba4ac37052fe5d2e07f223 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>
+---
+ 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_constrainedlayout.py | 10 +++++-----
+ lib/matplotlib/tests/test_legend.py            |  4 ++--
+ lib/matplotlib/tests/test_polar.py             |  2 +-
+ lib/matplotlib/tests/test_tightlayout.py       | 10 +++++-----
+ 8 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/extern/meson.build b/extern/meson.build
+index 662feb7872..df42b908af 100644
+--- a/extern/meson.build
++++ b/extern/meson.build
+@@ -14,7 +14,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 346e3d3454..ebf5818417 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -1313,7 +1313,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 0ed5a11c13..ee220f1854 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -7714,7 +7714,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],
+@@ -7732,7 +7732,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 8a83515f16..26bc9d6c48 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_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
+index 4dc4d9501e..47a4e80bb5 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -435,7 +435,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():
+@@ -641,9 +641,9 @@ 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)
++    np.testing.assert_allclose(pos.x1, 0.7024, atol=1e-2)
+ 
+     # wider than tall
+     fig, axs = plt.subplots(2, 3, layout='compressed',
+@@ -656,10 +656,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 0353f1408b..f5b341daaa 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 6b3c08d2eb..5160112e37 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 9c654f4d1f..9678e34a80 100644
+--- a/lib/matplotlib/tests/test_tightlayout.py
++++ b/lib/matplotlib/tests/test_tightlayout.py
+@@ -174,13 +174,13 @@ def test_outward_ticks():
+     # These values were obtained after visual checking that they correspond
+     # to a tight layouting that did take the ticks into account.
+     expected = [
+-        [[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]],
++        [[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),
+                            expected[nn])
+ 
+ 
+-- 
+2.44.0
+

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

@@ -0,0 +1,84 @@
+From 0aecbcfd5fd12c79f1f71998be9f86fc4108d91d 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/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(-)
+
+diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
+index e1f08c0da5..5c0d56c74d 100644
+--- a/lib/matplotlib/mlab.py
++++ b/lib/matplotlib/mlab.py
+@@ -49,6 +49,7 @@ Spectral functions
+ 
+ import functools
+ from numbers import Number
++import sys
+ 
+ import numpy as np
+ 
+@@ -210,6 +211,30 @@ def detrend_linear(y):
+     return y - (b*x + a)
+ 
+ 
++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, :]
+-- 
+2.44.0
+

22979.patch

@@ -1,38 +0,0 @@
-From dc5b6e87b6f4e1817720ea5aea1110231aab5667 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Wed, 4 May 2022 20:41:01 -0400
-Subject: [PATCH] Skip additional backend tests on import error
-
-All the Qt tests in this file already do this, and the remaining one
-fails if running headless.
----
- lib/matplotlib/tests/test_backend_gtk3.py | 2 +-
- lib/matplotlib/tests/test_backend_qt.py   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_backend_gtk3.py b/lib/matplotlib/tests/test_backend_gtk3.py
-index 5442930d117f..937ddef5a13f 100644
---- a/lib/matplotlib/tests/test_backend_gtk3.py
-+++ b/lib/matplotlib/tests/test_backend_gtk3.py
-@@ -6,7 +6,7 @@
- pytest.importorskip("matplotlib.backends.backend_gtk3agg")
- 
- 
--@pytest.mark.backend("gtk3agg")
-+@pytest.mark.backend("gtk3agg", skip_on_importerror=True)
- def test_correct_key():
-     pytest.xfail("test_widget_send_event is not triggering key_press_event")
- 
-diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
-index eee4e56536ec..61abf58ac84e 100644
---- a/lib/matplotlib/tests/test_backend_qt.py
-+++ b/lib/matplotlib/tests/test_backend_qt.py
-@@ -193,7 +193,7 @@ def test_other_signal_before_sigint(target, kwargs):
-     plt.figure()
- 
- 
--@pytest.mark.backend('Qt5Agg')
-+@pytest.mark.backend('Qt5Agg', skip_on_importerror=True)
- def test_fig_sigint_override(qt_core):
-     from matplotlib.backends.backend_qt5 import _BackendQT5
-     # Create a figure

changelog

@@ -1,3 +1,14 @@
+* Tue Dec 17 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.9.1-0
+- bootstrap epel10
+-  temporarily (or is it?) remove qt5 sub-package. Will epel10 get qt5?
+-  temporarily remove test w/ xvfb-run until I can figure out the
+   proper replacement.
+-  inkscape seems to not be needed. Or am I wrong about that? It builds 
+   without it as a BR. Will add it back when inkscape is built for EPEL10.
+
+* 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

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

python-matplotlib.spec

@@ -26,26 +26,27 @@
 %  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.5.3
+%global mpl_images_version 3.9.1
 
 # The version of FreeType in this Fedora branch.
-%global ftver 2.12.1
+%global ftver 2.13.1
 
 Name:           python-matplotlib
-Version:        3.5.3
-%global Version 3.5.3
-Release:        %autorelease
+Version:        3.9.1
+%global Version %{version_no_tilde %{quote:%nil}}
+Release:        6%{?dist}
 Summary:        Python 2D plotting library
 # qt_editor backend is MIT
-# ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is Public Domain
-License:        Python and MIT and Public Domain
-URL:            http://matplotlib.org
-Source0:        https://github.com/matplotlib/matplotlib/archive/v%{Version}/matplotlib-%{Version}.tar.gz
-Source1:        mplsetup.cfg
+# ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is CC0
+License:        PSF-2.0 AND MIT AND CC0-1.0
+URL:            https://matplotlib.org
+Source0:        %pypi_source matplotlib %{Version}
 
 # Fedora-specific patches; see:
 # https://github.com/fedora-python/matplotlib/tree/fedora-patches
@@ -53,9 +54,13 @@ Source1:        mplsetup.cfg
 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
+# We don't need to use NumPy 1.25.
+Patch1002:      0002-Unpin-NumPy-build-requirement.patch
 # Increase tolerances for new FreeType everywhere:
-Patch1002:      0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
-Patch1003:      0003-Increase-a-few-test-tolerances-on-some-arches.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
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -63,7 +68,7 @@ BuildRequires:  glibc-langpack-en
 BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  qhull-devel
-BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:	wlheadless-run
 BuildRequires:  zlib-devel
 
 BuildRequires:  ghostscript
@@ -71,9 +76,11 @@ BuildRequires:  ghostscript
 %if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} < 8)
 BuildRequires:  ImageMagick
 %endif
-%ifnarch s390x
-BuildRequires:  inkscape
-%endif
+## BuildRequires:  inkscape
+
+BuildRequires:  font(dejavusans)
+BuildRequires:  font(notosanscjkjp)
+BuildRequires:  font(wenquanyizenhei)
 
 BuildRequires:  texlive-collection-basic
 BuildRequires:  texlive-collection-fontsrecommended
@@ -86,39 +93,35 @@ BuildRequires:  texlive-tex-bin
 BuildRequires:  texlive-xetex-bin
 # Search for documentclass and add the classes here.
 BuildRequires:  tex(article.cls)
-BuildRequires:  tex(minimal.cls)
 # Search for inputenc and add any encodings used with it.
 BuildRequires:  tex(utf8.def)
 BuildRequires:  tex(utf8x.def)
 # Found with: rg -Io 'usepackage(\[.+\])?\{.+\}' lib | rg -o '\{.+\}' | sort -u
 # and then removing duplicates in one line, etc.
 BuildRequires:  tex(avant.sty)
-BuildRequires:  tex(bm.sty)
 BuildRequires:  tex(chancery.sty)
 BuildRequires:  tex(charter.sty)
 BuildRequires:  tex(chemformula.sty)
 BuildRequires:  tex(color.sty)
 BuildRequires:  tex(courier.sty)
-BuildRequires:  tex(euler.sty)
-BuildRequires:  tex(fancyhdr.sty)
 BuildRequires:  tex(fontenc.sty)
 BuildRequires:  tex(fontspec.sty)
 BuildRequires:  tex(geometry.sty)
 BuildRequires:  tex(graphicx.sty)
 BuildRequires:  tex(helvet.sty)
+BuildRequires:  tex(hyperref.sty)
 BuildRequires:  tex(import.sty)
 BuildRequires:  tex(inputenc.sty)
+BuildRequires:  tex(lmodern.sty)
 BuildRequires:  tex(mathpazo.sty)
 BuildRequires:  tex(mathptmx.sty)
 BuildRequires:  tex(pgf.sty)
-BuildRequires:  tex(preview.sty)
-BuildRequires:  tex(psfrag.sty)
 BuildRequires:  tex(sfmath.sty)
 BuildRequires:  tex(textcomp.sty)
 BuildRequires:  tex(txfonts.sty)
 BuildRequires:  tex(type1cm.sty)
 BuildRequires:  tex(type1ec.sty)
-BuildRequires:  tex(unicode-math.sty)
+BuildRequires:  tex(underscore.sty)
 # See BakomaFonts._fontmap in lib/matplotlib/mathtext.py
 BuildRequires:  tex(cmb10.tfm)
 BuildRequires:  tex(cmex10.tfm)
@@ -153,9 +156,9 @@ Obsoletes:      python-matplotlib-data < 3
 %if %{with bundled_fonts}
 %package -n python3-matplotlib-data-fonts
 Summary:        Fonts used by python-matplotlib
-# STIX and Computer Modern is OFL
+# Carlogo, STIX and Computer Modern is OFL
 # DejaVu is Bitstream Vera and Public Domain
-License:        OFL and Bitstream Vera and 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
@@ -167,22 +170,21 @@ Obsoletes:      python-matplotlib-data-fonts < 3
 %package -n     python3-matplotlib
 Summary:        Python 2D plotting library
 BuildRequires:  python3-devel
-BuildRequires:  python3-cairo
-BuildRequires:  python3-gobject
-BuildRequires:  python3-pytz
-BuildRequires:  python3-sphinx
+BuildRequires:  python3dist(pycairo)
+BuildRequires:  python3dist(pytz)
+BuildRequires:  python3dist(sphinx)
 Requires:       dejavu-sans-fonts
 Recommends:     texlive-dvipng
 Requires:       (texlive-dvipng if texlive-base)
 Requires:       python3-matplotlib-data = %{version}-%{release}
-Requires:       python3-cairo
+Requires:       python3dist(pycairo)
 Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
 %if %{with check}
-BuildRequires:  python3-pytest
-BuildRequires:  python3-pytest-rerunfailures
-BuildRequires:  python3-pytest-timeout
-BuildRequires:  python3-pytest-xdist
-BuildRequires:  python3-pikepdf
+BuildRequires:  python3dist(pytest)
+BuildRequires:  python3dist(pytest-rerunfailures)
+BuildRequires:  python3dist(pytest-timeout)
+BuildRequires:  python3dist(pytest-xdist)
+BuildRequires:  python3dist(pikepdf)
 %endif
 %if %{without bundled_fonts}
 Requires:       stix-math-fonts
@@ -201,14 +203,16 @@ Matplotlib tries to make easy things easy and hard things possible.
 You can generate plots, histograms, power spectra, bar charts,
 errorcharts, scatterplots, etc, with just a few lines of code.
 
-%package -n     python3-matplotlib-qt5
-Summary:        Qt5 backend for python3-matplotlib
-BuildRequires:  python3-qt5
+%package -n     python3-matplotlib-qt6
+Summary:        Qt6 backend for python3-matplotlib
+BuildRequires:  python3dist(cairocffi)
+BuildRequires:  python3dist(pyqt6)
+BuildRequires:  python3-pyqt6
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python3-qt5
-Obsoletes:      python3-matplotlib-qt4 < 3.5.0-0
+Requires:       python3dist(cairocffi)
+Requires:       python3dist(pyqt6)
 
-%description -n python3-matplotlib-qt5
+%description -n python3-matplotlib-qt6
 %{summary}
 
 %package -n     python3-matplotlib-gtk3
@@ -249,9 +253,9 @@ Requires:       python3-tkinter
 %if %{with wx}
 %package -n     python3-matplotlib-wx
 Summary:        WX backend for python3-matplotlib
-BuildRequires:  python3-wxpython4
+BuildRequires:  python3dist(wxpython)
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python3-wxpython4
+Requires:       python3dist(wxpython)
 
 %description -n python3-matplotlib-wx
 %{summary}
@@ -262,9 +266,10 @@ Summary:        Documentation files for python-matplotlib
 %if %{with html}
 BuildRequires:  graphviz
 BuildRequires:  make
-BuildRequires:  python3-sphinx
+BuildRequires:  python3dist(sphinx)
 BuildRequires:  tex(latex)
 BuildRequires:  tex-preview
+BuildRequires:  ipython
 %endif
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 
@@ -283,35 +288,32 @@ Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 %autosetup -n matplotlib-%{Version} -N
 
 # Fedora-specific patches follow:
-%patch1001 -p1
+%autopatch -p1 -m 1000
 # Updated test images for new FreeType.
-%patch1002 -p1
-gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
+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
-
-%patch1003 -p1
+# Backports or reported upstream
+%autopatch -p1 -M 999
 
 
 %generate_buildrequires
-%pyproject_buildrequires -r
+%pyproject_buildrequires -w %build_backend_args
 
 
 %build
 %set_build_flags
 export http_proxy=http://127.0.0.1/
 
-MPLCONFIGDIR=$PWD %pyproject_wheel
+MPLCONFIGDIR=$PWD %pyproject_wheel %build_backend_args
 %if %{with html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 MPLCONFIGDIR=$PWD \
-PYTHONPATH=$(ls -d %{_pyproject_builddir}/pip-req-build-*/build/lib.%{python3_platform}-%{python3_version}) \
+PYTHONPATH="%{pyproject_site_lib}" \
     make -C doc html
 %endif
 # Ensure all example files are non-executable so that the -doc
 # package doesn't drag in dependencies
-find examples -name '*.py' -exec chmod a-x '{}' \;
+find galleries -name '*.py' -exec chmod a-x '{}' \;
 
 
 %install
@@ -320,7 +322,6 @@ 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
 
@@ -344,22 +345,20 @@ mktexfmt latex.fmt
 mktexfmt lualatex.fmt
 mktexfmt pdflatex.fmt
 mktexfmt xelatex.fmt
+# Also prime the font cache.
+%{py3_test_envvars} %{python3} -c 'import matplotlib.font_manager'
 
 export http_proxy=http://127.0.0.1/
-# 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}
-     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.tests
-%endif
 
+# 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"
+%ifarch %{ix86}
+# This test won't work due to Xvfb not existing.
+k="${k-}${k+ and }not test_cross_Qt_imports"
+%endif
+%endif
 
 %files -n python3-matplotlib-data
 %{_datadir}/matplotlib/mpl-data/
@@ -373,20 +372,19 @@ MPLCONFIGDIR=$PWD \
 %endif
 
 %files -n python3-matplotlib-doc
-%doc examples
+%doc galleries/examples
 %if %{with html}
 %doc doc/build/html/*
 %endif
 
 %files -n python3-matplotlib
 %license LICENSE/
-%doc README.rst
+%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/
-%exclude %{python3_sitearch}/mpl_toolkits/tests/baseline_images/*
+%exclude %{python3_sitearch}/mpl_toolkits/*/tests/baseline_images/*
 %pycached %{python3_sitearch}/pylab.py
 %pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*.py
 %pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
@@ -400,10 +398,11 @@ MPLCONFIGDIR=$PWD \
 
 %files -n python3-matplotlib-test-data
 %{python3_sitearch}/matplotlib/tests/baseline_images/
-%{python3_sitearch}/mpl_toolkits/tests/baseline_images/
+%{python3_sitearch}/mpl_toolkits/*/tests/baseline_images/
 
-%files -n python3-matplotlib-qt5
-%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5*.py
+# This is handled by backend_qt*.py (no number), so the package exists only for
+# the dependencies.
+%files -n python3-matplotlib-qt6
 
 %files -n python3-matplotlib-gtk3
 %pycached %{python3_sitearch}/matplotlib/backends/backend_gtk3*.py

sources

@@ -1,2 +1,2 @@
-SHA512 (matplotlib-3.5.3.tar.gz) = 8d8bc28ef62a2373a0740ba5322f04ddbcc6485caf06883b54904f1ff7c979b9c4425516274d2b9e0cb63607d11bc3149044bee7ccac37de6ccd80480791cd4d
-SHA512 (matplotlib-3.5.3-with-freetype-2.12.1.tar.gz) = 52793236ed8bafb8f9bd18608a69e1893e95cde2a2af416d7688ce6919df2af199752f7bf05ac41525e231a316fd3fd0192f2c5d0e399708161dec0939e1101e
+SHA512 (matplotlib-3.9.1.tar.gz) = a1d48c42a5f4f04b57e34d25df842917e6380b8d6b6d1018c9b630cbbea4619b1d75729a218a6f52b63d4a61c2204bb26ad8f741566f84e41ca73190e419f672
+SHA512 (matplotlib-3.9.1-with-freetype-2.13.1.tar.gz) = 7d7d04d410265e6f3adc95bc103f12432f5c3c2b3788ab11f2326054f1cd116ff795bd2d2999cdb4da997df597bec00bbba61acea6de5eb9d56c686aa47a7bf7