Update to latest version (#2273293)

[skip changelog]

.gitignore

@@ -90,3 +90,21 @@ 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
+/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

0001-matplotlibrc-path-search-fix.patch

@@ -1,7 +1,7 @@
-From 3e43f06eaad8cdb48d30b4cbe23a881c6fa5c1ff Mon Sep 17 00:00:00 2001
+From ce0e47a95ec43750080afa889b35ec26106a6a47 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/4] matplotlibrc path search fix
+Subject: [PATCH 1/5] 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 77d25bbe33..9786447e23 100644
+index 353406832c..26dd9372e1 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -540,7 +540,8 @@ def get_cachedir():
+@@ -582,7 +582,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 77d25bbe33..9786447e23 100644
  
  
  def matplotlib_fname():
-@@ -560,6 +561,7 @@ def matplotlib_fname():
+@@ -602,6 +603,7 @@ def matplotlib_fname():
            is not defined)
      - On other platforms,
        - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
@@ -30,7 +30,7 @@ index 77d25bbe33..9786447e23 100644
      - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
        exist.
      """
-@@ -578,6 +580,7 @@ def matplotlib_fname():
+@@ -620,6 +622,7 @@ def matplotlib_fname():
              yield matplotlibrc
              yield os.path.join(matplotlibrc, 'matplotlibrc')
          yield os.path.join(get_configdir(), 'matplotlibrc')
@@ -39,5 +39,5 @@ index 77d25bbe33..9786447e23 100644
  
      for fname in gen_candidates():
 -- 
-2.36.1
+2.43.0
 

0002-Unpin-NumPy-build-requirement.patch

@@ -0,0 +1,41 @@
+From 05484ecf85b7f9ca67da454a4147098023626a81 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/5] 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 44f56d8cc1..33ce124527 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -5,18 +5,7 @@ requires = [
+     "pybind11>=2.6",
+     "setuptools>=64",
+     "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.setuptools_scm]
+-- 
+2.43.0
+

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

@@ -1,145 +0,0 @@
-From 0939c27b1d47cabd19c09fc09f15ef4fb18331b4 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/4] 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_backend_pgf.py | 2 +-
- 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_mathtext.py    | 7 +++++--
- 7 files changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index c8604b8657..da72bb9415 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -1031,7 +1031,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
-@@ -2340,7 +2341,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 4336b761f6..7d3927408b 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
- 
-@@ -233,7 +235,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 8bf77f0d54..82c0b09ac3 100644
---- a/lib/matplotlib/tests/test_contour.py
-+++ b/lib/matplotlib/tests/test_contour.py
-@@ -319,7 +319,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 46dbe4cfe8..268473c6c0 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -1322,8 +1322,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 e7002df8a5..8738fd94a0 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
- 
-@@ -165,7 +166,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_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
-index 7f8b06fa0e..d7d5e687fe 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
-@@ -198,7 +199,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))
-@@ -239,7 +241,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))
--- 
-2.36.1
-

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

@@ -1,36 +1,38 @@
-From c7f6a197992cfd989fddb858afcde5abcdecf70e Mon Sep 17 00:00:00 2001
+From 1bbba2045f0722ccd97513037d49f2f656e349df 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/4] Set FreeType version to 2.12.1 and update tolerances.
+Subject: [PATCH 3/5] 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 ++--
- lib/matplotlib/tests/test_constrainedlayout.py |  6 +++---
- lib/matplotlib/tests/test_polar.py             |  2 +-
- lib/matplotlib/tests/test_tightlayout.py       | 10 +++++-----
- setupext.py                                    | 15 +++++++++++++--
- 6 files changed, 25 insertions(+), 14 deletions(-)
+ lib/matplotlib/__init__.py                    |  2 +-
+ lib/matplotlib/tests/test_axes.py             |  4 ++--
+ lib/matplotlib/tests/test_backend_pgf.py      |  2 +-
+ .../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 ++++-----
+ setupext.py                                   | 21 +++++++++++++++++--
+ 8 files changed, 36 insertions(+), 19 deletions(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 9786447e23..56266f0688 100644
+index 26dd9372e1..81b77d455f 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -1213,7 +1213,7 @@ default_test_modules = [
+@@ -1307,7 +1307,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 `setupext.py`
 -    LOCAL_FREETYPE_VERSION = '2.6.1'
-+    LOCAL_FREETYPE_VERSION = '2.12.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 8d6466c749..c8604b8657 100644
+index 0372747009..9cee2dbd41 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
-@@ -7210,7 +7210,7 @@ def test_normal_axes():
+@@ -7642,7 +7642,7 @@ def test_normal_axes():
      ]
      for nn, b in enumerate(bbaxis):
          targetbb = mtransforms.Bbox.from_bounds(*target[nn])
@@ -39,7 +41,7 @@ index 8d6466c749..c8604b8657 100644
  
      target = [
          [150.0, 119.999, 930.0, 11.111],
-@@ -7228,7 +7228,7 @@ def test_normal_axes():
+@@ -7660,7 +7660,7 @@ def test_normal_axes():
  
      target = [85.5138, 75.88888, 1021.11, 1017.11]
      targetbb = mtransforms.Bbox.from_bounds(*target)
@@ -48,11 +50,24 @@ index 8d6466c749..c8604b8657 100644
  
      # 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 64906b74c3..bfa53cd430 100644
+index 6703dfe315..ea6a8d9630 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -431,7 +431,7 @@ def test_hidden_axes():
+@@ -432,7 +432,7 @@ def test_hidden_axes():
      extents1 = np.copy(axs[0, 0].get_position().extents)
  
      np.testing.assert_allclose(
@@ -61,16 +76,19 @@ index 64906b74c3..bfa53cd430 100644
  
  
  def test_colorbar_align():
-@@ -637,7 +637,7 @@ def test_compressed1():
+@@ -638,9 +638,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-3)
++    np.testing.assert_allclose(pos.x1, 0.7024, atol=1e-2)
  
-@@ -652,7 +652,7 @@ def test_compressed1():
+     # wider than tall
+     fig, axs = plt.subplots(2, 3, layout='compressed',
+@@ -653,10 +653,10 @@ def test_compressed1():
  
      pos = axs[0, 0].get_position()
      np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
@@ -78,12 +96,32 @@ index 64906b74c3..bfa53cd430 100644
 +    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-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 759ac6aada..8140d4d69f 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -516,9 +516,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 c51508ae22..942ffcb521 100644
+index 9a1c6be6fc..7df88e96b4 100644
 --- a/lib/matplotlib/tests/test_polar.py
 +++ b/lib/matplotlib/tests/test_polar.py
-@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
+@@ -321,7 +321,7 @@ def test_get_tightbbox_polar():
      fig.canvas.draw()
      bb = ax.get_tightbbox(fig.canvas.get_renderer())
      assert_allclose(
@@ -93,7 +131,7 @@ index c51508ae22..942ffcb521 100644
  
  @check_figures_equal(extensions=["png"])
 diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
-index 1eb7b4b453..697eba3211 100644
+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():
@@ -115,15 +153,17 @@ index 1eb7b4b453..697eba3211 100644
  
  
 diff --git a/setupext.py b/setupext.py
-index 0387223b94..13096a812c 100644
+index 9f78d88c87..6dc740e8f7 100644
 --- a/setupext.py
 +++ b/setupext.py
-@@ -168,13 +168,23 @@ _freetype_hashes = {
+@@ -176,14 +176,30 @@ _freetype_hashes = {
          '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
      '2.10.1':
          '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
 +    '2.10.2':
 +        'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
++    '2.10.3':
++        '9dfb4e11efd6e460a87b1991a64bc69344ee7dc219d9b29e7faabc1c168ce8b0',
 +    '2.10.4':
 +        '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
 +    '2.11.0':
@@ -135,23 +175,28 @@ index 0387223b94..13096a812c 100644
 +        '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`.
+ # `.circleci/config.yml`. Also update the docs in
+ # `docs/devel/dependencies.rst`.
 -TESTING_VERSION_OF_FREETYPE = '2.6.1'
-+TESTING_VERSION_OF_FREETYPE = '2.12.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
-@@ -584,6 +594,7 @@ class FreeType(SetupPackage):
-             ext.extra_objects.insert(
-                 0, str(src_path / 'objs' / '.libs' / libfreetype))
-             ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'local'))
+@@ -599,6 +615,7 @@ class FreeType(SetupPackage):
+                 name = ext.name.split('.')[-1]
+                 ext.extra_link_args.append(
+                     f'-Wl,-exported_symbol,_PyInit_{name}')
 +            ext.libraries.append('brotlidec')
  
      def do_custom_build(self, env):
          # We're using a system freetype
 -- 
-2.36.1
+2.43.0
 

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

@@ -1,18 +1,18 @@
-From 77d0ef4bac7e14da704556a6f1f99962b0864a6a Mon Sep 17 00:00:00 2001
+From 59c900f49d605c1300c4bdaef23c94ad32a07e29 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
+Subject: [PATCH 4/5] Use old stride_windows implementation on 32-bit x86
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- lib/matplotlib/mlab.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ 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 5e85a9c119..d75acf6d26 100644
+index 1948e6333e..158417a1c0 100644
 --- a/lib/matplotlib/mlab.py
 +++ b/lib/matplotlib/mlab.py
-@@ -52,6 +52,7 @@ Spectral functions
+@@ -49,6 +49,7 @@ Spectral functions
  
  import functools
  from numbers import Number
@@ -20,17 +20,65 @@ index 5e85a9c119..d75acf6d26 100644
  
  import numpy as np
  
-@@ -252,7 +253,9 @@ def stride_windows(x, n, noverlap=None, axis=0):
+@@ -210,6 +211,30 @@ def detrend_linear(y):
+     return y - (b*x + a)
  
- 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(
+ 
++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.36.1
+2.43.0
 

0005-TST-Increase-some-tolerances-for-non-x86-arches.patch

@@ -0,0 +1,26 @@
+From f6edb2b275f8fb4daa047df0b12008eac53306f0 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Fri, 11 Aug 2023 05:13:38 -0400
+Subject: [PATCH 5/5] TST: Increase some tolerances for non-x86 arches
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ lib/mpl_toolkits/mplot3d/tests/test_axes3d.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
+index b3fcffcc6e..f400312859 100644
+--- a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
++++ b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
+@@ -2264,7 +2264,7 @@ def test_scatter_masked_color():
+            len(super(type(path3d), path3d).get_facecolors())
+ 
+ 
+-@mpl3d_image_comparison(['surface3d_zsort_inf.png'], style='mpl20')
++@mpl3d_image_comparison(['surface3d_zsort_inf.png'], style='mpl20', tol=0.055)
+ def test_surface3d_zsort_inf():
+     fig = plt.figure()
+     ax = fig.add_subplot(projection='3d')
+-- 
+2.43.0
+

changelog

@@ -1,3 +1,6 @@
+* 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

python-matplotlib.spec

@@ -30,19 +30,19 @@
 %global _docdir_fmt %{name}
 
 # Updated test images for new FreeType.
-%global mpl_images_version 3.6.1
+%global mpl_images_version 3.8.3
 
 # The version of FreeType in this Fedora branch.
-%global ftver 2.12.1
+%global ftver 2.13.1
 
 Name:           python-matplotlib
-Version:        3.6.3
-%global Version 3.6.3
+Version:        3.8.4
+%global Version %{version_no_tilde %{quote:%nil}}
 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
@@ -53,12 +53,15 @@ 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
+# https://github.com/matplotlib/matplotlib/pull/26502
+Patch0002:      0005-TST-Increase-some-tolerances-for-non-x86-arches.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -296,18 +299,15 @@ 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
-%patch0001 -p1
+%autopatch -p1 -M 999
 
 
 %generate_buildrequires
@@ -322,12 +322,12 @@ MPLCONFIGDIR=$PWD %pyproject_wheel
 %if %{with html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 MPLCONFIGDIR=$PWD \
-PYTHONPATH="%{pyprojec_site_lib}" \
+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
@@ -360,6 +360,8 @@ 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:
@@ -373,7 +375,7 @@ MPLCONFIGDIR=$PWD \
          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
+             --pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d
 %endif
 
 
@@ -389,20 +391,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
@@ -416,7 +417,7 @@ 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

sources

@@ -1,2 +1,2 @@
-SHA512 (matplotlib-3.6.3.tar.gz) = 844ca90bcc9953d3d1289a6d471180a3dadb49c75eb59858bbbfb67d4b1292b83b86b366f22ab12d9e97c980376d48b86e745607ec4e812a3010c6fec01398dc
-SHA512 (matplotlib-3.6.1-with-freetype-2.12.1.tar.gz) = 9210cfe8db2743519188d924dfd5f4ec4a0b5ae589b8a596f5a35b900234fa3a2fe81a047fc486ec69359259685438f4c19bb96a63ca0f544d2f48fbabb1326e
+SHA512 (matplotlib-3.8.4.tar.gz) = d4c6a5b3484927dbae1b1203e9984b67d08c958c4a5136abaa805f1eb221146fb1211e5f20456e281d41fc09c94917a796ffacfdb185c58eeeb6d19e60c78b1a
+SHA512 (matplotlib-3.8.3-with-freetype-2.13.1.tar.gz) = 72b207fac6539cf9e64706cbd61be4bf2349be8d5f66083db1f014cdbdf049c48f2ce17a67ac0e646f668818cff6ffa9053fc31f2c2f4bc3f8e9f70272146d8f