Re-enable wx support (bz#2211203)

And disable it on RHEL 8+ as WX is not available there.

.gitignore

@@ -26,3 +26,45 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-2.2.3.tar.gz
 /matplotlib-2.2.3-with-freetype-2.8.tar.gz
 /matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.0rc1.tar.gz
+/matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.0rc2.tar.gz
+/matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.0.tar.gz
+/matplotlib-3.0.0-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.1.tar.gz
+/matplotlib-3.0.1-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.2.tar.gz
+/matplotlib-3.0.3.tar.gz
+/matplotlib-3.1.0rc1.tar.gz
+/matplotlib-3.1.0.tar.gz
+/matplotlib-3.1.0-with-freetype-2.10.0.tar.gz
+/matplotlib-3.1.1.tar.gz
+/matplotlib-3.1.1-with-freetype-2.10.0.tar.gz
+/matplotlib-3.1.2.tar.gz
+/matplotlib-3.2.0rc3.tar.gz
+/matplotlib-3.2.0rc3-with-freetype-2.10.1.tar.gz
+/matplotlib-3.2.0.tar.gz
+/matplotlib-3.2.0-with-freetype-2.10.1.tar.gz
+/matplotlib-3.2.1.tar.gz
+/matplotlib-3.2.2.tar.gz
+/matplotlib-3.2.2-with-freetype-2.10.1.tar.gz
+/matplotlib-3.3.0rc1.tar.gz
+/matplotlib-3.3.0rc1-with-freetype-2.10.1.tar.gz
+/matplotlib-3.3.0.tar.gz
+/matplotlib-3.3.0-with-freetype-2.10.2.tar.gz
+/matplotlib-3.3.1.tar.gz
+/matplotlib-3.3.2.tar.gz
+/matplotlib-3.3.3.tar.gz
+/matplotlib-3.3.3-with-freetype-2.10.4.tar.gz
+/matplotlib-3.3.4.tar.gz
+/matplotlib-3.4.0rc1.tar.gz
+/matplotlib-3.4.0rc1-with-freetype-2.10.4.tar.gz
+/matplotlib-3.4.0rc3.tar.gz
+/matplotlib-3.4.1.tar.gz
+/matplotlib-3.4.1-with-freetype-2.10.4.tar.gz
+/matplotlib-3.4.2.tar.gz
+/matplotlib-3.4.1-with-freetype-2.11.0.tar.gz
+/matplotlib-3.4.3.tar.gz
+/matplotlib-3.4.3-with-freetype-2.10.4.tar.gz
+/matplotlib-3.4.3-with-freetype-2.11.0.tar.gz

0001-FIX-account-for-constant-deprecations-in-Pillow-9.1.patch

@@ -0,0 +1,45 @@
+From edf0b7412cd5cdf6e07f035d542c93033c374b37 Mon Sep 17 00:00:00 2001
+From: Thomas A Caswell <tcaswell@gmail.com>
+Date: Fri, 1 Apr 2022 11:46:32 -0400
+Subject: [PATCH] FIX: account for constant deprecations in Pillow 9.1
+
+https://pillow.readthedocs.io/en/stable/deprecations.html#constants
+https://pillow.readthedocs.io/en/stable/releasenotes/9.1.0.html#constants
+
+Image.None -> Image.Dither.None
+Image.ADAPTIVE -> Image.Palette.ADAPTIVE
+
+(cherry picked from commit bb997708c08dae01ac95104f1f33d8c08c4715d4)
+---
+ lib/matplotlib/backends/backend_pdf.py | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
+index 26a12764da..fa7d4a0075 100644
+--- a/lib/matplotlib/backends/backend_pdf.py
++++ b/lib/matplotlib/backends/backend_pdf.py
+@@ -1646,8 +1646,19 @@ end"""
+                 # Convert to indexed color if there are 256 colors or fewer
+                 # This can significantly reduce the file size
+                 num_colors = len(img_colors)
+-                img = img.convert(mode='P', dither=Image.NONE,
+-                                  palette=Image.ADAPTIVE, colors=num_colors)
++                # These constants were converted to IntEnums and deprecated in
++                # Pillow 9.2
++                dither = (
++                    Image.Dither.NONE if hasattr(Image, 'Dither')
++                    else Image.NONE
++                )
++                pmode = (
++                    Image.Palette.ADAPTIVE if hasattr(Image, 'Palette')
++                    else Image.ADAPTIVE
++                )
++                img = img.convert(
++                    mode='P', dither=dither, palette=pmode, colors=num_colors
++                )
+                 png_data, bit_depth, palette = self._writePng(img)
+                 if bit_depth is None or palette is None:
+                     raise RuntimeError("invalid PNG header")
+-- 
+2.39.2
+

0001-Force-using-system-qhull.patch

@@ -1,43 +0,0 @@
-From 46361ca058295e3f08d3c54196d990c497834306 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Fri, 30 Mar 2018 03:15:51 -0400
-Subject: [PATCH] Force using system qhull.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- setupext.py | 17 ++---------------
- 1 file changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/setupext.py b/setupext.py
-index d2ff239ad..30e0c9085 100644
---- a/setupext.py
-+++ b/setupext.py
-@@ -1318,23 +1318,10 @@ class Qhull(SetupPackage):
- 
-     def check(self):
-         self.__class__.found_external = True
--        try:
--            return self._check_for_pkg_config(
--                'libqhull', 'libqhull/qhull_a.h', min_version='2015.2')
--        except CheckFailed as e:
--            self.__class__.found_pkgconfig = False
--            self.__class__.found_external = False
--            return str(e) + ' Using local copy.'
-+        return ' Using system copy.'
- 
-     def add_flags(self, ext):
--        if self.found_external:
--            pkg_config.setup_extension(ext, 'qhull',
--                                       default_libraries=['qhull'])
--        else:
--            ext.include_dirs.insert(0, 'extern')
--            ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
--            if sysconfig.get_config_var('LIBM') == '-lm':
--                ext.libraries.extend('m')
-+        ext.libraries.append('qhull')
- 
- 
- class TTConv(SetupPackage):
--- 
-2.14.3
-

0001-matplotlibrc-path-search-fix.patch

@@ -1,97 +1,43 @@
-From e318adb6b70cdb27eb8cd5235909b8e8430080d7 Mon Sep 17 00:00:00 2001
+From 60ab4094d885067c50694d2f11cd640dc5c0f0c6 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/2] matplotlibrc path search fix
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- lib/matplotlib/__init__.py            |  8 +++++---
- lib/matplotlib/tests/test_rcparams.py | 22 ++++++++++++++++------
- 2 files changed, 21 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 c5accc3c3..bc38f316c 100644
+index 71c68a3d6b..88be8e97b0 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -738,9 +738,12 @@ def _get_data_path():
+@@ -473,7 +473,8 @@ def get_cachedir():
+ @_logged_cached('matplotlib data path: %s')
+ def get_data_path():
+     """Return the path to Matplotlib data."""
+-    return str(Path(__file__).with_name("mpl-data"))
++    return str(Path(__file__).parent.parent.parent.parent.parent /
++               'share/matplotlib/mpl-data')
  
-     _file = _decode_filesystem_path(__file__)
-     path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
-+    path = '/usr/share/matplotlib/mpl-data'
-     if os.path.isdir(path):
-         return path
  
-+    raise RuntimeError('Could not find the matplotlib data files')
-+
-     # setuptools' namespace_packages may highjack this init file
-     # so need to try something known to be in matplotlib, not basemap
-     import matplotlib.afm
-@@ -821,8 +824,7 @@ def matplotlib_fname():
- 
-          - `$HOME/.matplotlib/matplotlibrc` if `$HOME` is defined.
- 
--    - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
--      system-defined copy.
-+    - Lastly, it looks in `/etc/matplotlibrc` for a system-defined copy.
+ def matplotlib_fname():
+@@ -493,6 +494,7 @@ def matplotlib_fname():
+           is not defined)
+     - On other platforms,
+       - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
++    - ``/etc/matplotlibrc``
+     - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
+       exist.
      """
- 
-     def gen_candidates():
-@@ -835,7 +837,7 @@ def matplotlib_fname():
+@@ -511,6 +513,7 @@ def matplotlib_fname():
              yield matplotlibrc
              yield os.path.join(matplotlibrc, 'matplotlibrc')
-         yield os.path.join(_get_configdir(), 'matplotlibrc')
--        yield os.path.join(get_data_path(), 'matplotlibrc')
+         yield os.path.join(get_configdir(), 'matplotlibrc')
 +        yield '/etc/matplotlibrc'
+         yield os.path.join(get_data_path(), 'matplotlibrc')
  
      for fname in gen_candidates():
-         if os.path.exists(fname):
-diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
-index c0378e1bf..7f14bcc46 100644
---- a/lib/matplotlib/tests/test_rcparams.py
-+++ b/lib/matplotlib/tests/test_rcparams.py
-@@ -424,14 +424,25 @@ def test_rcparams_reset_after_fail():
-         assert mpl.rcParams['text.usetex'] is False
- 
- 
--def test_if_rctemplate_is_up_to_date():
-+@pytest.fixture
-+def mplrc():
-+    # This is the Fedora-specific location ...
-+    if 'MATPLOTLIBDATA' in os.environ:
-+        # ... in buildroot.
-+        return os.path.join(os.environ['MATPLOTLIBDATA'],
-+                            '../../../../etc/matplotlibrc')
-+    else:
-+        # ... on installed systems.
-+        return '/etc/matplotlibrc'
-+
-+
-+def test_if_rctemplate_is_up_to_date(mplrc):
-     # This tests if the matplotlibrc.template file
-     # contains all valid rcParams.
-     dep1 = mpl._all_deprecated
-     dep2 = mpl._deprecated_set
-     deprecated = list(dep1.union(dep2))
--    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
--    with open(path_to_rc, "r") as f:
-+    with open(mplrc, "r") as f:
-         rclines = f.readlines()
-     missing = {}
-     for k, v in mpl.defaultParams.items():
-@@ -453,11 +464,10 @@ def test_if_rctemplate_is_up_to_date():
-                          .format(missing.items()))
- 
- 
--def test_if_rctemplate_would_be_valid(tmpdir):
-+def test_if_rctemplate_would_be_valid(tmpdir, mplrc):
-     # This tests if the matplotlibrc.template file would result in a valid
-     # rc file if all lines are uncommented.
--    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
--    with open(path_to_rc, "r") as f:
-+    with open(mplrc, "r") as f:
-         rclines = f.readlines()
-     newlines = []
-     for line in rclines:
 -- 
-2.17.1
+2.31.1
 

0002-Increase-tolerances-for-non-x86_64-arches.patch

@@ -1,27 +0,0 @@
-From ece1f936ba4c130cf82d3954a5e677d96ca3a854 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Tue, 23 Jan 2018 20:27:17 -0500
-Subject: [PATCH 2/3] Increase tolerances for non-x86_64 arches.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/matplotlib/tests/test_streamplot.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index 81a51e711..4f70ce861 100644
---- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -58,8 +58,7 @@ def test_linewidth():
-                    linewidth=lw)
- 
- 
--@image_comparison(baseline_images=['streamplot_masks_and_nans'],
--                  tol=0.04 if on_win else 0)
-+@image_comparison(baseline_images=['streamplot_masks_and_nans'], tol=0.01)
- def test_masks_and_nans():
-     X, Y, U, V = velocity_field()
-     mask = np.zeros(U.shape, dtype=bool)
--- 
-2.17.1
-

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

@@ -0,0 +1,165 @@
+From 7ca8afa7fa3e141464c1ef2b2c58b23b586bf310 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/2] Set FreeType version to 2.10.4 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                                    |  9 ++++++++-
+ 7 files changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index 88be8e97b0..22dc74181e 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -1137,7 +1137,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.10.4'
+ 
+     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 7950e5b830..046dbbe1b8 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -6500,7 +6500,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],
+@@ -6518,7 +6518,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 117b221cc2..d009912dfa 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -429,7 +429,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 b5fd906d2f..8e3801a231 100644
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -1,5 +1,6 @@
+ import io
+ import os
++import platform
+ import re
+ 
+ import numpy as np
+@@ -189,7 +190,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))
+@@ -213,7 +215,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 c614eff027..daf4e26fb8 100644
+--- a/lib/matplotlib/tests/test_polar.py
++++ b/lib/matplotlib/tests/test_polar.py
+@@ -312,7 +312,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 23d363b508..e94c863477 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 d8d0b6b393..e44d3b046a 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -167,12 +167,18 @@ _freetype_hashes = {
+         '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
+     '2.10.1':
+         '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
++    '2.10.2':
++        'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
++    '2.10.4':
++        '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
++    '2.11.0':
++        'a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f',
+ }
+ # 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)
+-LOCAL_FREETYPE_VERSION = '2.6.1'
++LOCAL_FREETYPE_VERSION = '2.10.4'
+ LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
+ 
+ LOCAL_QHULL_VERSION = '2020.2'
+@@ -565,6 +571,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.31.1
+

0003-Increase-some-tolerances-for-32-bit-systems.patch

@@ -1,567 +0,0 @@
-From b8a97810843ff739cb98cb5159843f2836dbd8b3 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sat, 31 Mar 2018 00:15:14 -0400
-Subject: [PATCH 3/3] Increase some tolerances for 32-bit systems.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/matplotlib/testing/decorators.py          |  2 +-
- lib/matplotlib/tests/test_artist.py           |  3 +-
- lib/matplotlib/tests/test_axes.py             | 47 +++++++++----------
- lib/matplotlib/tests/test_collections.py      |  2 +-
- lib/matplotlib/tests/test_colorbar.py         | 11 +++--
- .../tests/test_constrainedlayout.py           |  2 +-
- lib/matplotlib/tests/test_contour.py          |  6 +--
- lib/matplotlib/tests/test_image.py            |  2 +-
- lib/matplotlib/tests/test_mathtext.py         |  4 +-
- lib/matplotlib/tests/test_patches.py          |  3 +-
- lib/matplotlib/tests/test_patheffects.py      |  2 +-
- lib/matplotlib/tests/test_pickle.py           |  2 +-
- lib/matplotlib/tests/test_quiver.py           |  2 +-
- lib/matplotlib/tests/test_streamplot.py       |  3 +-
- lib/matplotlib/tests/test_transforms.py       |  2 +-
- .../tests/test_axisartist_floating_axes.py    |  4 +-
- ...test_axisartist_grid_helper_curvelinear.py |  6 +--
- lib/mpl_toolkits/tests/test_mplot3d.py        |  4 +-
- 18 files changed, 53 insertions(+), 54 deletions(-)
-
-diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
-index 0ce6e6252..9a80eec1a 100644
---- a/lib/matplotlib/testing/decorators.py
-+++ b/lib/matplotlib/testing/decorators.py
-@@ -408,7 +408,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol,
-     return decorator
- 
- 
--def image_comparison(baseline_images, extensions=None, tol=0,
-+def image_comparison(baseline_images, extensions=None, tol=0.1,
-                      freetype_version=None, remove_text=False,
-                      savefig_kwarg=None,
-                      # Default of mpl_test_settings fixture and cleanup too.
-diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
-index e6aff72bf..b60305bcf 100644
---- a/lib/matplotlib/tests/test_artist.py
-+++ b/lib/matplotlib/tests/test_artist.py
-@@ -96,7 +96,8 @@ def test_collection_transform_of_none():
-     assert isinstance(c._transOffset, mtransforms.IdentityTransform)
- 
- 
--@image_comparison(baseline_images=["clip_path_clipping"], remove_text=True)
-+@image_comparison(baseline_images=["clip_path_clipping"], remove_text=True,
-+                  tol=0.28)
- def test_clipping():
-     exterior = mpath.Path.unit_rectangle().deepcopy()
-     exterior.vertices *= 4
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 2fa6c2c94..8c589f514 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -555,7 +555,7 @@ def test_single_point():
-     plt.plot('b', 'b', 'o', data=data)
- 
- 
--@image_comparison(baseline_images=['single_date'])
-+@image_comparison(baseline_images=['single_date'], tol=1.97)
- def test_single_date():
-     time1 = [721964.0]
-     data1 = [-65.54]
-@@ -739,8 +739,7 @@ def test_polar_rlabel_position():
-     ax.tick_params(rotation='auto')
- 
- 
--@image_comparison(baseline_images=['polar_theta_wedge'], style='default',
--                  tol=0.01 if six.PY2 else 0)
-+@image_comparison(baseline_images=['polar_theta_wedge'], style='default')
- def test_polar_theta_limits():
-     r = np.arange(0, 3.0, 0.01)
-     theta = 2*np.pi*r
-@@ -1023,7 +1022,7 @@ def test_fill_between_interpolate():
- 
- 
- @image_comparison(baseline_images=['fill_between_interpolate_decreasing'],
--                  style='mpl20', remove_text=True)
-+                  style='mpl20', remove_text=True, tol=0.78)
- def test_fill_between_interpolate_decreasing():
-     p = np.array([724.3, 700, 655])
-     t = np.array([9.4, 7, 2.2])
-@@ -1105,7 +1104,7 @@ def test_pcolormesh():
- 
- 
- @image_comparison(baseline_images=['pcolormesh_datetime_axis'],
--                  extensions=['png'], remove_text=False)
-+                  extensions=['png'], remove_text=False, tol=0.19)
- def test_pcolormesh_datetime_axis():
-     fig = plt.figure()
-     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
-@@ -1131,7 +1130,7 @@ def test_pcolormesh_datetime_axis():
- 
- 
- @image_comparison(baseline_images=['pcolor_datetime_axis'],
--                  extensions=['png'], remove_text=False)
-+                  extensions=['png'], remove_text=False, tol=0.19)
- def test_pcolor_datetime_axis():
-     fig = plt.figure()
-     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
-@@ -1188,7 +1187,7 @@ def test_canonical():
- 
- 
- @image_comparison(baseline_images=['arc_angles'], remove_text=True,
--                  style='default', extensions=['png'])
-+                  style='default', extensions=['png'], tol=0.17)
- def test_arc_angles():
-     from matplotlib import patches
-     # Ellipse parameters
-@@ -2450,7 +2449,7 @@ def test_boxplot_mod_artist_after_plotting():
- 
- @image_comparison(baseline_images=['violinplot_vert_baseline',
-                                    'violinplot_vert_baseline'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.24)
- def test_vert_violinplot_baseline():
-     # First 9 digits of frac(sqrt(2))
-     np.random.seed(414213562)
-@@ -2468,7 +2467,7 @@ def test_vert_violinplot_baseline():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showmeans'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_vert_violinplot_showmeans():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(3))
-@@ -2479,7 +2478,7 @@ def test_vert_violinplot_showmeans():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showextrema'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_vert_violinplot_showextrema():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(5))
-@@ -2490,7 +2489,7 @@ def test_vert_violinplot_showextrema():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showmedians'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_vert_violinplot_showmedians():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(7))
-@@ -2501,7 +2500,7 @@ def test_vert_violinplot_showmedians():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showall'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
- def test_vert_violinplot_showall():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(11))
-@@ -2512,7 +2511,7 @@ def test_vert_violinplot_showall():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_vert_violinplot_custompoints_10():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(13))
-@@ -2523,7 +2522,7 @@ def test_vert_violinplot_custompoints_10():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_vert_violinplot_custompoints_200():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(17))
-@@ -2534,7 +2533,7 @@ def test_vert_violinplot_custompoints_200():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_baseline'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
- def test_horiz_violinplot_baseline():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(19))
-@@ -2545,7 +2544,7 @@ def test_horiz_violinplot_baseline():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showmedians'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_horiz_violinplot_showmedians():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(23))
-@@ -2556,7 +2555,7 @@ def test_horiz_violinplot_showmedians():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showmeans'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.25)
- def test_horiz_violinplot_showmeans():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(29))
-@@ -2567,7 +2566,7 @@ def test_horiz_violinplot_showmeans():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showextrema'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
- def test_horiz_violinplot_showextrema():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(31))
-@@ -2578,7 +2577,7 @@ def test_horiz_violinplot_showextrema():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showall'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.19)
- def test_horiz_violinplot_showall():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(37))
-@@ -2589,7 +2588,7 @@ def test_horiz_violinplot_showall():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_horiz_violinplot_custompoints_10():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(41))
-@@ -2600,7 +2599,7 @@ def test_horiz_violinplot_custompoints_10():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_horiz_violinplot_custompoints_200():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(43))
-@@ -3947,7 +3946,7 @@ def test_psd_noise():
- 
- 
- @image_comparison(baseline_images=['csd_freqs'], remove_text=True,
--                  extensions=['png'], tol=0.002)
-+                  extensions=['png'], tol=0.21)
- def test_csd_freqs():
-     '''test axes.csd with sinusoidal stimuli'''
-     n = 10000
-@@ -4806,7 +4805,7 @@ def test_rc_spines():
- 
- 
- @image_comparison(baseline_images=['rc_grid'], extensions=['png'],
--                  savefig_kwarg={'dpi': 40})
-+                  savefig_kwarg={'dpi': 40}, tol=0.2)
- def test_rc_grid():
-     fig = plt.figure()
-     rc_dict0 = {
-@@ -5301,7 +5300,7 @@ def test_date_timezone_y():
- 
- 
- @image_comparison(baseline_images=['date_timezone_x_and_y'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=3.05)
- def test_date_timezone_x_and_y():
-     # Tests issue 5575
-     time_index = [pytz.timezone('UTC').localize(datetime.datetime(
-diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
-index 291647d17..265f23fed 100644
---- a/lib/matplotlib/tests/test_collections.py
-+++ b/lib/matplotlib/tests/test_collections.py
-@@ -467,7 +467,7 @@ def test_EllipseCollection():
- 
- 
- @image_comparison(baseline_images=['polycollection_close'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.45)
- def test_polycollection_close():
-     from mpl_toolkits.mplot3d import Axes3D
- 
-diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
-index 12a9bed3b..86d2358fb 100644
---- a/lib/matplotlib/tests/test_colorbar.py
-+++ b/lib/matplotlib/tests/test_colorbar.py
-@@ -95,7 +95,7 @@ def _colorbar_extension_length(spacing):
- @image_comparison(
-         baseline_images=['colorbar_extensions_shape_uniform',
-                          'colorbar_extensions_shape_proportional'],
--        extensions=['png'])
-+        extensions=['png'], tol=0.16)
- def test_colorbar_extension_shape():
-     '''Test rectangular colorbar extensions.'''
-     # Create figures for uniform and proportionally spaced colorbars.
-@@ -105,7 +105,7 @@ def test_colorbar_extension_shape():
- 
- @image_comparison(baseline_images=['colorbar_extensions_uniform',
-                                    'colorbar_extensions_proportional'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.25)
- def test_colorbar_extension_length():
-     '''Test variable length colorbar extensions.'''
-     # Create figures for uniform and proportionally spaced colorbars.
-@@ -119,7 +119,7 @@ def test_colorbar_extension_length():
-                                    'cbar_sharing',
-                                    ],
-                   extensions=['png'], remove_text=True,
--                  savefig_kwarg={'dpi': 40})
-+                  savefig_kwarg={'dpi': 40}, tol=0.17)
- def test_colorbar_positioning():
-     data = np.arange(1200).reshape(30, 40)
-     levels = [0, 200, 400, 600, 800, 1000, 1200]
-@@ -173,7 +173,7 @@ def test_colorbar_positioning():
- 
- @image_comparison(baseline_images=['cbar_with_subplots_adjust'],
-                   extensions=['png'], remove_text=True,
--                  savefig_kwarg={'dpi': 40})
-+                  savefig_kwarg={'dpi': 40}, tol=0.17)
- def test_gridspec_make_colorbar():
-     plt.figure()
-     data = np.arange(1200).reshape(30, 40)
-@@ -232,7 +232,8 @@ def test_colorbarbase():
- 
- @image_comparison(
-     baseline_images=['colorbar_closed_patch'],
--    remove_text=True)
-+    remove_text=True,
-+    tol=0.22)
- def test_colorbar_closed_patch():
-     fig = plt.figure(figsize=(8, 6))
-     ax1 = fig.add_axes([0.05, 0.85, 0.9, 0.1])
-diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index fcf633a08..cad431771 100644
---- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -295,7 +295,7 @@ def test_constrained_layout12():
-     ax.set_xlabel('x-label')
- 
- 
--@image_comparison(baseline_images=['constrained_layout13'], tol=2.e-2,
-+@image_comparison(baseline_images=['constrained_layout13'], tol=3.e-2,
-         extensions=['png'])
- def test_constrained_layout13():
-     'Test that padding works.'
-diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index 42903ac68..f03a5d0af 100644
---- a/lib/matplotlib/tests/test_contour.py
-+++ b/lib/matplotlib/tests/test_contour.py
-@@ -217,7 +217,7 @@ def test_given_colors_levels_and_extends():
- 
- 
- @image_comparison(baseline_images=['contour_datetime_axis'],
--                  extensions=['png'], remove_text=False)
-+                  extensions=['png'], remove_text=False, tol=0.18)
- def test_contour_datetime_axis():
-     fig = plt.figure()
-     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
-@@ -243,7 +243,7 @@ def test_contour_datetime_axis():
- 
- 
- @image_comparison(baseline_images=['contour_test_label_transforms'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=1.38)
- def test_labels():
-     # Adapted from pylab_examples example code: contour_demo.py
-     # see issues #2475, #2843, and #2818 for explanation
-@@ -274,7 +274,7 @@ def test_labels():
- 
- @image_comparison(baseline_images=['contour_corner_mask_False',
-                                    'contour_corner_mask_True'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.19)
- def test_corner_mask():
-     n = 60
-     mask_level = 0.95
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index e6da25789..ed3ab63c9 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -768,7 +768,7 @@ def test_imshow_endianess():
- 
- 
- @image_comparison(baseline_images=['imshow_masked_interpolation'],
--                  remove_text=True, style='mpl20')
-+                  remove_text=True, style='mpl20', tol=0.25)
- def test_imshow_masked_interpolation():
- 
-     cm = copy(plt.get_cmap('viridis'))
-diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
-index cdc1093e1..ac0d8bf05 100644
---- a/lib/matplotlib/tests/test_mathtext.py
-+++ b/lib/matplotlib/tests/test_mathtext.py
-@@ -173,7 +173,7 @@ def baseline_images(request, fontset, index):
-                          ['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.31)
- def test_mathtext_rendering(baseline_images, fontset, index, test):
-     matplotlib.rcParams['mathtext.fontset'] = fontset
-     fig = plt.figure(figsize=(5.25, 0.75))
-@@ -187,7 +187,7 @@ def test_mathtext_rendering(baseline_images, fontset, index, test):
-                          ['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.3)
- def test_mathfont_rendering(baseline_images, fontset, index, test):
-     matplotlib.rcParams['mathtext.fontset'] = fontset
-     fig = plt.figure(figsize=(5.25, 0.75))
-diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
-index ff1abb9c6..cc90e6bb0 100644
---- a/lib/matplotlib/tests/test_patches.py
-+++ b/lib/matplotlib/tests/test_patches.py
-@@ -266,9 +266,8 @@ def test_wedge_movement():
-         assert getattr(w, attr) == new_v
- 
- 
--# png needs tol>=0.06, pdf tol>=1.617
- @image_comparison(baseline_images=['wedge_range'],
--                  remove_text=True, tol=1.65 if on_win else 0)
-+                  remove_text=True)
- def test_wedge_range():
-     ax = plt.axes()
- 
-diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
-index fe7265957..2addc35ed 100644
---- a/lib/matplotlib/tests/test_patheffects.py
-+++ b/lib/matplotlib/tests/test_patheffects.py
-@@ -121,7 +121,7 @@ def test_SimplePatchShadow_offset():
-     assert pe._offset == (4, 5)
- 
- 
--@image_comparison(baseline_images=['collection'], tol=0.02)
-+@image_comparison(baseline_images=['collection'], tol=0.084)
- def test_collection():
-     x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
-     data = np.sin(x) + np.cos(y)
-diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
-index 89a5a512e..a25961284 100644
---- a/lib/matplotlib/tests/test_pickle.py
-+++ b/lib/matplotlib/tests/test_pickle.py
-@@ -42,7 +42,7 @@ def test_simple():
- 
- @image_comparison(baseline_images=['multi_pickle'],
-                   extensions=['png'], remove_text=True,
--                  style='mpl20')
-+                  style='mpl20', tol=0.11)
- def test_complete():
-     fig = plt.figure('Figure with a label?', figsize=(10, 6))
- 
-diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
-index a0e1e674f..ede6bfc64 100644
---- a/lib/matplotlib/tests/test_quiver.py
-+++ b/lib/matplotlib/tests/test_quiver.py
-@@ -131,7 +131,7 @@ def test_quiver_key_pivot():
- 
- 
- @image_comparison(baseline_images=['barbs_test_image'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.11)
- def test_barbs():
-     x = np.linspace(-5, 5, 5)
-     X, Y = np.meshgrid(x, x)
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index 4f70ce861..5bc8184f7 100644
---- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -39,8 +39,7 @@ def test_startpoints():
-     plt.plot(start_x, start_y, 'ok')
- 
- 
--@image_comparison(baseline_images=['streamplot_colormap'],
--                  tol=.02)
-+@image_comparison(baseline_images=['streamplot_colormap'])
- def test_colormap():
-     X, Y, U, V = velocity_field()
-     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
-diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
-index 06985db84..8efaef898 100644
---- a/lib/matplotlib/tests/test_transforms.py
-+++ b/lib/matplotlib/tests/test_transforms.py
-@@ -74,7 +74,7 @@ def test_external_transform_api():
- 
- 
- @image_comparison(baseline_images=['pre_transform_data'],
--                  tol=0.08)
-+                  tol=0.155)
- def test_pre_transform_plotting():
-     # a catch-all for as many as possible plot layouts which handle
-     # pre-transforming the data NOTE: The axis range is important in this
-diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
-index de7226609..2676fc842 100644
---- a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
-+++ b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
-@@ -24,7 +24,7 @@ def test_subplot():
- 
- 
- @image_comparison(baseline_images=['curvelinear3'],
--                  extensions=['png'], style='default', tol=0.01)
-+                  extensions=['png'], style='default', tol=0.02)
- def test_curvelinear3():
-     fig = plt.figure(figsize=(5, 5))
-     fig.clf()
-@@ -80,7 +80,7 @@ def test_curvelinear3():
- 
- 
- @image_comparison(baseline_images=['curvelinear4'],
--                  extensions=['png'], style='default', tol=0.01)
-+                  extensions=['png'], style='default', tol=0.055)
- def test_curvelinear4():
-     fig = plt.figure(figsize=(5, 5))
-     fig.clf()
-diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-index a7c637428..e22f4ac3e 100644
---- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-@@ -19,7 +19,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
- 
- 
- @image_comparison(baseline_images=['custom_transform'],
--                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.035)
- def test_custom_transform():
-     class MyTransform(Transform):
-         input_dims = 2
-@@ -91,7 +91,7 @@ def test_custom_transform():
- 
- 
- @image_comparison(baseline_images=['polar_box'],
--                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.08)
- def test_polar_box():
-     fig = plt.figure(figsize=(5, 5))
- 
-@@ -152,7 +152,7 @@ def test_polar_box():
- 
- 
- @image_comparison(baseline_images=['axis_direction'],
--                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.05)
- def test_axis_direction():
-     fig = plt.figure(figsize=(5, 5))
- 
-diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
-index 0a506db92..44e1681fc 100644
---- a/lib/mpl_toolkits/tests/test_mplot3d.py
-+++ b/lib/mpl_toolkits/tests/test_mplot3d.py
-@@ -225,7 +225,7 @@ def test_text3d():
-     ax.set_zlabel('Z axis')
- 
- 
--@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.03)
-+@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.05)
- def test_trisurf3d():
-     n_angles = 36
-     n_radii = 8
-@@ -704,7 +704,7 @@ class TestVoxels(object):
-     @image_comparison(
-         baseline_images=['voxels-xyz'],
-         extensions=['png'],
--        tol=0.01
-+        tol=0.02
-     )
-     def test_xyz(self):
-         fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
--- 
-2.17.1
-

0003-Increase-some-tolerances-for-non-x86-arches.patch

@@ -1,278 +0,0 @@
-From 3e2bfee4e8ce28fffa7e9cd0a054429af2e2ebe3 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sat, 31 Mar 2018 00:33:37 -0400
-Subject: [PATCH 3/3] Increase some tolerances for non-x86 arches.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- lib/matplotlib/tests/test_arrow_patches.py                 | 4 ++--
- lib/matplotlib/tests/test_axes.py                          | 7 ++++---
- lib/matplotlib/tests/test_backends_interactive.py          | 2 +-
- lib/matplotlib/tests/test_collections.py                   | 2 +-
- lib/matplotlib/tests/test_constrainedlayout.py             | 2 +-
- lib/matplotlib/tests/test_cycles.py                        | 6 +++---
- lib/matplotlib/tests/test_figure.py                        | 2 +-
- lib/matplotlib/tests/test_image.py                         | 2 +-
- lib/matplotlib/tests/test_legend.py                        | 6 +++---
- lib/matplotlib/tests/test_pickle.py                        | 2 +-
- lib/matplotlib/tests/test_scale.py                         | 2 +-
- lib/matplotlib/tests/test_streamplot.py                    | 2 +-
- lib/matplotlib/tests/test_units.py                         | 4 ++--
- .../tests/test_axisartist_grid_helper_curvelinear.py       | 2 +-
- 14 files changed, 23 insertions(+), 22 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index 44f87c5fe..fb50ae710 100644
---- a/lib/matplotlib/tests/test_arrow_patches.py
-+++ b/lib/matplotlib/tests/test_arrow_patches.py
-@@ -68,7 +68,7 @@ def __prepare_fancyarrow_dpi_cor_test():
- 
- 
- @image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'],
--                  remove_text=True, extensions=['png'],
-+                  remove_text=True, extensions=['png'], tol=0.016,
-                   savefig_kwarg=dict(dpi=100))
- def test_fancyarrow_dpi_cor_100dpi():
-     """
-@@ -83,7 +83,7 @@ def test_fancyarrow_dpi_cor_100dpi():
- 
- 
- @image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'],
--                  remove_text=True, extensions=['png'],
-+                  remove_text=True, extensions=['png'], tol=0.019,
-                   savefig_kwarg=dict(dpi=200))
- def test_fancyarrow_dpi_cor_200dpi():
-     """
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 2fa6c2c94..f785e3e89 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -389,7 +389,7 @@ def test_annotate_default_arrow():
-     assert ann.arrow_patch is not None
- 
- 
--@image_comparison(baseline_images=['polar_axes'], style='default')
-+@image_comparison(baseline_images=['polar_axes'], style='default', tol=0.01)
- def test_polar_annotations():
-     # you can specify the xypoint and the xytext in different
-     # positions and coordinate systems, and optionally turn on a
-@@ -3267,7 +3267,8 @@ def test_vertex_markers():
- 
- 
- @image_comparison(baseline_images=['vline_hline_zorder',
--                                   'errorbar_zorder'])
-+                                   'errorbar_zorder'],
-+                  tol=0.02)
- def test_eb_line_zorder():
-     x = list(xrange(10))
- 
-@@ -5000,7 +5001,7 @@ def test_title_location_roundtrip():
- 
- 
- @image_comparison(baseline_images=["loglog"], remove_text=True,
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.009)
- def test_loglog():
-     fig, ax = plt.subplots()
-     x = np.arange(1, 11)
-diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
-index df7a5d08a..3567d7f3d 100644
---- a/lib/matplotlib/tests/test_backends_interactive.py
-+++ b/lib/matplotlib/tests/test_backends_interactive.py
-@@ -55,4 +55,4 @@ def test_backend(backend):
-     environ["MPLBACKEND"] = backend
-     proc = Popen([sys.executable, "-c", _test_script], env=environ)
-     # Empirically, 1s is not enough on Travis.
--    assert proc.wait(timeout=10) == 0
-+    assert proc.wait(timeout=30) == 0
-diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
-index 291647d17..6b623ef52 100644
---- a/lib/matplotlib/tests/test_collections.py
-+++ b/lib/matplotlib/tests/test_collections.py
-@@ -443,7 +443,7 @@ def test_barb_limits():
- 
- 
- @image_comparison(baseline_images=['EllipseCollection_test_image'],
--                  extensions=['png'],
-+                  extensions=['png'], tol=0.012,
-                   remove_text=True)
- def test_EllipseCollection():
-     # Test basic functionality
-diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index fcf633a08..725365d2e 100644
---- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -222,7 +222,7 @@ def test_constrained_layout9():
- 
- 
- @image_comparison(baseline_images=['constrained_layout10'],
--        extensions=['png'])
-+        extensions=['png'], tol=0.01)
- def test_constrained_layout10():
-     'Test for handling legend outside axis'
-     fig, axs = plt.subplots(2, 2, constrained_layout=True)
-diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
-index dfa0f7c79..ac605c8ab 100644
---- a/lib/matplotlib/tests/test_cycles.py
-+++ b/lib/matplotlib/tests/test_cycles.py
-@@ -10,7 +10,7 @@ from cycler import cycler
- 
- 
- @image_comparison(baseline_images=['color_cycle_basic'], remove_text=True,
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.008)
- def test_colorcycle_basic():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']))
-@@ -27,7 +27,7 @@ def test_colorcycle_basic():
- 
- 
- @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
--                  remove_text=True, extensions=['png'])
-+                  remove_text=True, extensions=['png'], tol=0.008)
- def test_marker_cycle():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
-@@ -60,7 +60,7 @@ def test_marker_cycle():
- 
- 
- @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.009)
- def test_linestylecycle_basic():
-     fig, ax = plt.subplots()
-     ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
-diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 69752e17d..e7c57d470 100644
---- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -14,7 +14,7 @@ import numpy as np
- import pytest
- 
- 
--@image_comparison(baseline_images=['figure_align_labels'])
-+@image_comparison(baseline_images=['figure_align_labels'], tol=0.01)
- def test_align_labels():
-     # Check the figure.align_labels() command
-     fig = plt.figure(tight_layout=True)
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index e6da25789..626e9eb94 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -768,7 +768,7 @@ def test_imshow_endianess():
- 
- 
- @image_comparison(baseline_images=['imshow_masked_interpolation'],
--                  remove_text=True, style='mpl20')
-+                  remove_text=True, style='mpl20', tol=0.006)
- def test_imshow_masked_interpolation():
- 
-     cm = copy(plt.get_cmap('viridis'))
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index 55b8adc77..1784ff966 100644
---- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -145,7 +145,7 @@ def test_multiple_keys():
- 
- 
- @image_comparison(baseline_images=['rgba_alpha'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.007)
- def test_alpha_rgba():
-     import matplotlib.pyplot as plt
- 
-@@ -156,7 +156,7 @@ def test_alpha_rgba():
- 
- 
- @image_comparison(baseline_images=['rcparam_alpha'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.007)
- def test_alpha_rcparam():
-     import matplotlib.pyplot as plt
- 
-@@ -183,7 +183,7 @@ def test_fancy():
-                ncol=2, shadow=True, title="My legend", numpoints=1)
- 
- 
--@image_comparison(baseline_images=['framealpha'], remove_text=True)
-+@image_comparison(baseline_images=['framealpha'], remove_text=True, tol=0.018)
- def test_framealpha():
-     x = np.linspace(1, 100, 100)
-     y = x
-diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
-index 89a5a512e..99051dee7 100644
---- a/lib/matplotlib/tests/test_pickle.py
-+++ b/lib/matplotlib/tests/test_pickle.py
-@@ -42,7 +42,7 @@ def test_simple():
- 
- @image_comparison(baseline_images=['multi_pickle'],
-                   extensions=['png'], remove_text=True,
--                  style='mpl20')
-+                  style='mpl20', tol=0.004)
- def test_complete():
-     fig = plt.figure('Figure with a label?', figsize=(10, 6))
- 
-diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
-index dd5b18182..ebebb0525 100644
---- a/lib/matplotlib/tests/test_scale.py
-+++ b/lib/matplotlib/tests/test_scale.py
-@@ -96,7 +96,7 @@ def test_logscale_transform_repr():
- 
- 
- @image_comparison(baseline_images=['logscale_nonpos_values'], remove_text=True,
--                  extensions=['png'], style='mpl20')
-+                  extensions=['png'], style='mpl20', tol=0.008)
- def test_logscale_nonpos_values():
-     np.random.seed(19680801)
-     xs = np.random.normal(size=int(1e3))
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index 4f70ce861..4e52ed0c4 100644
---- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -48,7 +48,7 @@ def test_colormap():
-     plt.colorbar()
- 
- 
--@image_comparison(baseline_images=['streamplot_linewidth'])
-+@image_comparison(baseline_images=['streamplot_linewidth'], tol=0.002)
- def test_linewidth():
-     X, Y, U, V = velocity_field()
-     speed = np.sqrt(U*U + V*V)
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index 65c8da7ea..c69d1d531 100644
---- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -43,7 +43,7 @@ class Quantity(object):
- 
- # Tests that the conversion machinery works properly for classes that
- # work as a facade over numpy arrays (like pint)
--@image_comparison(baseline_images=['plot_pint'],
-+@image_comparison(baseline_images=['plot_pint'], tol=0.003,
-                   extensions=['png'], remove_text=False, style='mpl20')
- def test_numpy_facade():
-     # Create an instance of the conversion interface and
-@@ -87,7 +87,7 @@ def test_numpy_facade():
- 
- 
- # Tests gh-8908
--@image_comparison(baseline_images=['plot_masked_units'],
-+@image_comparison(baseline_images=['plot_masked_units'], tol=0.007,
-                   extensions=['png'], remove_text=True, style='mpl20')
- def test_plot_masked_units():
-     data = np.linspace(-5, 5)
-diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-index a7c637428..8fc5b25b1 100644
---- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-@@ -91,7 +91,7 @@ def test_custom_transform():
- 
- 
- @image_comparison(baseline_images=['polar_box'],
--                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.04)
- def test_polar_box():
-     fig = plt.figure(figsize=(5, 5))
- 
--- 
-2.17.1
-

python-matplotlib.spec

@@ -1,15 +1,24 @@
-%global with_html               0
+%bcond_with html
+%bcond_without check
+# https://fedorahosted.org/fpc/ticket/381
+%bcond_without bundled_fonts
 
-# It seems like there's some kind of weird occasional error where a
-# build (often aarch64 or ppc64) will fail in one of the Stix font
-# tests with a huge RMS difference, but if you run the same build again,
-# you won't get the same error. Unless someone can figure out what's
-# going on, we just have to keep re-running the build until it doesn't
-# happen.
-%global run_tests               1
+# No qt4 for EL8/ELN/EL9
+%if 0%{?rhel} >= 8
+%bcond_with qt4
+%else
+%bcond_without qt4
+%endif
 
-# the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
-# CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
+# No WX for EL8
+%if 0%{?rhel} == 8
+%bcond_with wx
+%else
+%bcond_without wx
+%endif
+
+# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
+# WXAgg Agg Cairo PS PDF SVG
 %global backend                 TkAgg
 
 %if "%{backend}" == "TkAgg"
@@ -20,256 +29,158 @@
 %  else
 %    if "%{backend}" == "Qt5Agg"
 %global backend_subpackage qt5
+%    else
+%      if "%{backend}" == "WXAgg"
+%global backend_subpackage wx
+%      endif
 %    endif
 %  endif
 %endif
 
-# https://fedorahosted.org/fpc/ticket/381
-%global with_bundled_fonts      1
-
 # Use the same directory of the main package for subpackage licence and docs
 %global _docdir_fmt %{name}
 
-#global rctag rc1
+# Updated test images for new FreeType.
+%global mpl_images_version 3.4.3
 
 # The version of FreeType in this Fedora branch.
-%if %{fedora} >= 29
-%global ftver 2.9.1
-%else
-%global ftver 2.8
-%endif
+%global ftver 2.10.4
 
 Name:           python-matplotlib
-Version:        2.2.3
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Version:        3.4.3
+%global Version 3.4.3
+Release:        4%{?dist}
 Summary:        Python 2D plotting library
 # qt4_editor backend is MIT
-License:        Python and 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}%{?rctag}/matplotlib-%{version}%{?rctag}.tar.gz
+Source0:        https://github.com/matplotlib/matplotlib/archive/v%{Version}/matplotlib-%{Version}.tar.gz
 Source1:        setup.cfg
 
-# Because the qhull package stopped shipping pkgconfig files.
-# https://src.fedoraproject.org/rpms/qhull/pull-request/1
-Patch0001:      0001-Force-using-system-qhull.patch
+# Upstream backported patches
+# https://github.com/matplotlib/matplotlib/commit/bb997708c08dae01ac95104f1f33d8c08c4715d4
+Patch1:         0001-FIX-account-for-constant-deprecations-in-Pillow-9.1.patch
 
 # Fedora-specific patches; see:
-# https://github.com/QuLogic/matplotlib/tree/fedora-patches
-# https://github.com/QuLogic/matplotlib/tree/fedora-patches-non-x86
+# https://github.com/fedora-python/matplotlib/tree/fedora-patches
 # Updated test images for new FreeType.
-Source1000:     https://github.com/QuLogic/mpl-images/archive/v%{version}-with-freetype-%{ftver}/matplotlib-%{version}-with-freetype-%{ftver}.tar.gz
+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
-# Image tolerances for anything but x86_64:
-Patch1002:      0002-Increase-tolerances-for-non-x86_64-arches.patch
-# Image tolerances for 32-bit systems: i686 armv7hl
-Patch1003:      0003-Increase-some-tolerances-for-32-bit-systems.patch
-# Image tolerances for 64-bit (but not x86_64) systems: aarch64 ppc64(le) s390x
-Patch1004:      0003-Increase-some-tolerances-for-non-x86-arches.patch
+# Increase tolerances for new FreeType everywhere:
+Patch1002:      0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch
 
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-langpack-en
 BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  qhull-devel
-BuildRequires:  texlive-cm
 BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  zlib-devel
 
+BuildRequires:  ghostscript
+# No ImageMagick for EL8/ELN/EL9
+%if ! 0%{?rhel} >= 8
+BuildRequires:  ImageMagick
+%endif
+%ifnarch s390x
+BuildRequires:  inkscape
+%endif
+
+BuildRequires:  texlive-collection-basic
+BuildRequires:  texlive-collection-fontsrecommended
+BuildRequires:  texlive-collection-latex
+BuildRequires:  texlive-collection-latexrecommended
+BuildRequires:  texlive-dvipng
+BuildRequires:  texlive-latex-bin
+BuildRequires:  texlive-luahbtex
+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(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(import.sty)
+BuildRequires:  tex(inputenc.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)
+# See BakomaFonts._fontmap in lib/matplotlib/mathtext.py
+BuildRequires:  tex(cmb10.tfm)
+BuildRequires:  tex(cmex10.tfm)
+BuildRequires:  tex(cmmi10.tfm)
+BuildRequires:  tex(cmr10.tfm)
+BuildRequires:  tex(cmss10.tfm)
+BuildRequires:  tex(cmsy10.tfm)
+BuildRequires:  tex(cmtt10.tfm)
+
 %description
-Matplotlib is a python 2D plotting library which produces publication
+Matplotlib is a Python 2D plotting library which produces publication
 quality figures in a variety of hardcopy formats and interactive
-environments across platforms. matplotlib can be used in python
-scripts, the python and ipython shell, web application servers, and
-six graphical user interface toolkits.
+environments across platforms. Matplotlib can be used in Python
+scripts, the Python and IPython shell, web application servers, and
+various graphical user interface toolkits.
 
 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 python2-matplotlib
-Summary:        Python 2D plotting library
-BuildRequires:  python2-numpy
-BuildRequires:  python2-pyparsing
-BuildRequires:  python2-dateutil
-BuildRequires:  python2-kiwisolver
-BuildRequires:  python2-pyside
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-six
-BuildRequires:  python2-sphinx
-BuildRequires:  python2-subprocess32
-BuildRequires:  python2-devel
-BuildRequires:  python2-backports-functools_lru_cache
-BuildRequires:  python2-pillow
-BuildRequires:  python2-pytz
-%if %{with_html}
-BuildRequires:  %{_bindir}/pdftops
-# circular dependency: python2-basemap requires matplotlib
-BuildRequires:  python2-basemap
-BuildRequires:  python2-ipython-sphinx
-BuildRequires:  python2-numpydoc
-BuildRequires:  python2-scikit-image
-BuildRequires:  python2-colorspacious
-BuildRequires:  python2-cycler >= 0.10.0
-%endif
-%if %{run_tests}
-BuildRequires:  python2-pytest
-BuildRequires:  python2-pytest-xdist
-BuildRequires:  python2-cycler >= 0.10.0
-BuildRequires:  python2-mock
-%endif
-Requires:       dejavu-sans-fonts
-Requires:       dvipng
-Requires:       python2-numpy
-Requires:       python2-pyparsing
-Requires:       python2-cycler >= 0.10.0
-Requires:       python2-dateutil
-Requires:       python2-kiwisolver
-Requires:       python2-backports-functools_lru_cache
-Requires:       python-matplotlib-data = %{version}-%{release}
-%{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}
-Recommends:     python2-pillow
-Requires:       python2-six
-Requires:       python2-subprocess32
-Requires:       python2-pytz
-%if !%{with_bundled_fonts}
-Requires:       stix-math-fonts
-%else
-Provides:       bundled(stix-math-fonts)
-%endif
-%{?python_provide:%python_provide python2-matplotlib}
-Provides:       bundled(agg) = 2.4
-Provides:       bundled(ttconv)
-Provides:       bundled(js-jquery1) = 1.11.3
-Provides:       bundled(js-jquery1-ui) = 1.11.4
-Provides:       bundled(texlive-helvetic)
-
-%description -n python2-matplotlib
-Matplotlib is a python 2D plotting library which produces publication
-quality figures in a variety of hardcopy formats and interactive
-environments across platforms. matplotlib can be used in python
-scripts, the python and ipython shell, web application servers, and
-six graphical user interface toolkits.
-
-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 python2-matplotlib-qt4
-Summary:        Qt4 backend for python-matplotlib
-BuildRequires:  PyQt4-devel
-Requires:       python2-PyQt4
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python2-matplotlib-qt5
-%{?python_provide:%python_provide python2-matplotlib-qt4}
-
-%description -n python2-matplotlib-qt4
-%{summary}
-
-%package -n python2-matplotlib-qt5
-Summary:        Qt5 backend for python-matplotlib
-BuildRequires:  python2-qt5
-Requires:       python2-qt5
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-matplotlib-qt5}
-
-%description -n python2-matplotlib-qt5
-%{summary}
-
-%package -n python2-matplotlib-gtk
-Summary:        GTK backend for python-matplotlib
-BuildRequires:  gtk2-devel
-BuildRequires:  pycairo-devel
-BuildRequires:  pygtk2-devel
-Requires:       pycairo
-Requires:       pygtk2
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-matplotlib-gtk}
-
-%description -n python2-matplotlib-gtk
-%{summary}
-
-%package -n python2-matplotlib-gtk3
-Summary:        GTK3 backend for python-matplotlib
-# This should be converted to typelib(Gtk) when supported
-BuildRequires:  gtk3
-BuildRequires:  pygobject3-base
-Requires:       gtk3%{?_isa}
-Requires:       pygobject3-base%{?_isa}
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-matplotlib-gtk3}
-
-%description -n python2-matplotlib-gtk3
-%{summary}
-
-%package -n python2-matplotlib-tk
-Summary:        Tk backend for python-matplotlib
-BuildRequires:  tcl-devel
-BuildRequires:  tkinter
-BuildRequires:  tk-devel
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       tkinter
-%{?python_provide:%python_provide python2-matplotlib-tk}
-
-%description -n python2-matplotlib-tk
-%{summary}
-
-%package -n python2-matplotlib-wx
-Summary:        wxPython backend for python-matplotlib
-BuildRequires:  wxPython-devel
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python2-wxpython
-%{?python_provide:%python_provide python2-matplotlib-wx}
-
-%description -n python2-matplotlib-wx
-%{summary}
-
-%package -n python2-matplotlib-test-data
-Summary:        Test data for python2-matplotlib
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-matplotlib-test-data}
-
-%description -n python2-matplotlib-test-data
-%{summary}
-
-%package -n python2-matplotlib-doc
-Summary:        Documentation files for python-matplotlib
-%if %{with_html}
-BuildRequires:  dvipng
-BuildRequires:  graphviz
-BuildRequires:  python2-sphinx
-BuildRequires:  tex(latex)
-BuildRequires:  tex-preview
-%endif
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-matplotlib-doc}
-
-%description -n python2-matplotlib-doc
-%{summary}
-
-%package -n python-matplotlib-data
+%package -n python3-matplotlib-data
 Summary:        Data used by python-matplotlib
 BuildArch:      noarch
-%if %{with_bundled_fonts}
-Requires:       python-matplotlib-data-fonts = %{version}-%{release}
+%if %{with bundled_fonts}
+Requires:       python3-matplotlib-data-fonts = %{version}-%{release}
 %endif
-%{?python_provide:%python_provide python-matplotlib-data}
+Obsoletes:      python-matplotlib-data < 3
 
-%description -n python-matplotlib-data
+%description -n python3-matplotlib-data
 %{summary}
 
-%if %{with_bundled_fonts}
-%package -n python-matplotlib-data-fonts
+%if %{with bundled_fonts}
+%package -n python3-matplotlib-data-fonts
 Summary:        Fonts used by python-matplotlib
+# STIX and Computer Modern is OFL
+# DejaVu is Bitstream Vera and Public Domain
+License:        OFL and Bitstream Vera and Public Domain
 BuildArch:      noarch
-Requires:       python-matplotlib-data = %{version}-%{release}
-%{?python_provide:%python_provide python-matplotlib-data-fonts}
+Requires:       python3-matplotlib-data = %{version}-%{release}
+Obsoletes:      python-matplotlib-data-fonts < 3
 
-%description -n python-matplotlib-data-fonts
+%description -n python3-matplotlib-data-fonts
 %{summary}
 %endif
 
 %package -n     python3-matplotlib
 Summary:        Python 2D plotting library
 BuildRequires:  python3-cairo
+BuildRequires:  python3-certifi >= 2020.06.20
 BuildRequires:  python3-cycler >= 0.10.0
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-devel
@@ -280,53 +191,59 @@ BuildRequires:  python3-numpy
 BuildRequires:  python3-pillow
 BuildRequires:  python3-pyparsing
 BuildRequires:  python3-pytz
-BuildRequires:  python3-six
 BuildRequires:  python3-sphinx
 Requires:       dejavu-sans-fonts
-Requires:       dvipng
-Requires:       python-matplotlib-data = %{version}-%{release}
+Recommends:     texlive-dvipng
+Requires:       (texlive-dvipng if texlive-base)
+Requires:       python3-matplotlib-data = %{version}-%{release}
 Requires:       python3-cairo
 Requires:       python3-cycler >= 0.10.0
 Requires:       python3-dateutil
 Requires:       python3-kiwisolver
 Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
-%if %{run_tests}
+%if %{with check}
 BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-rerunfailures
+BuildRequires:  python3-pytest-timeout
 BuildRequires:  python3-pytest-xdist
+BuildRequires:  python3-pikepdf
 %endif
 Requires:       python3-numpy
 Recommends:     python3-pillow
 Requires:       python3-pyparsing
-Requires:       python3-pytz
-Requires:       python3-six
-%if !%{with_bundled_fonts}
+%if %{without bundled_fonts}
 Requires:       stix-math-fonts
 %else
 Provides:       bundled(stix-math-fonts)
 %endif
-%{?python_provide:%python_provide python3-matplotlib}
 
 %description -n python3-matplotlib
-Matplotlib is a python 2D plotting library which produces publication
+Matplotlib is a Python 2D plotting library which produces publication
 quality figures in a variety of hardcopy formats and interactive
-environments across platforms. matplotlib can be used in python
-scripts, the python and ipython shell, web application servers, and
-six graphical user interface toolkits.
+environments across platforms. Matplotlib can be used in Python
+scripts, the Python and IPython shell, web application servers, and
+various graphical user interface toolkits.
 
 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.
 
+%if %{with qt4}
 %package -n     python3-matplotlib-qt4
 Summary:        Qt4 backend for python3-matplotlib
 BuildRequires:  python3-PyQt4-devel
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3-matplotlib-qt5
 Requires:       python3-PyQt4
-%{?python_provide:%python_provide python3-matplotlib-qt4}
+
+# Upstream has deprecated this backend due to Qt4 being no longer supported.
+# This backend will be removed when upstream does, likely in 3.5, or Fedora 35.
+# The removal date is thus estimated to be the Fedora 35 Branch point.
+Provides:       deprecated() = 20210810
 
 %description -n python3-matplotlib-qt4
 %{summary}
+%endif
 
 %package -n     python3-matplotlib-qt5
 Summary:        Qt5 backend for python3-matplotlib
@@ -338,7 +255,6 @@ Requires:       python3-qt5
 %description -n python3-matplotlib-qt5
 %{summary}
 
-# gtk2 never worked in Python 3 afaict, so no need for -gtk subpackage
 %package -n     python3-matplotlib-gtk3
 Summary:        GTK3 backend for python3-matplotlib
 # This should be converted to typelib(Gtk) when supported
@@ -347,7 +263,6 @@ BuildRequires:  python3-gobject
 Requires:       gtk3%{?_isa}
 Requires:       python3-gobject%{?_isa}
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-matplotlib-gtk3}
 
 %description -n python3-matplotlib-gtk3
 %{summary}
@@ -357,275 +272,326 @@ Summary:        Tk backend for python3-matplotlib
 BuildRequires:  python3-tkinter
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3-tkinter
-%{?python_provide:%python_provide python3-matplotlib-tk}
 
 %description -n python3-matplotlib-tk
 %{summary}
 
+%if %{with wx}
+%package -n     python3-matplotlib-wx
+Summary:        WX backend for python3-matplotlib
+BuildRequires:  python3-wxpython4
+Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
+Requires:       python3-wxpython4
+
+%description -n python3-matplotlib-wx
+%{summary}
+%endif
+
+%package -n python3-matplotlib-doc
+Summary:        Documentation files for python-matplotlib
+%if %{with html}
+BuildRequires:  graphviz
+BuildRequires:  python3-sphinx
+BuildRequires:  tex(latex)
+BuildRequires:  tex-preview
+BuildRequires:  js-jquery >= 3.2.1
+BuildRequires:  xstatic-jquery-ui-common
+Requires:       js-jquery >= 3.2.1
+Requires:       xstatic-jquery-ui-common
+%endif
+Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-matplotlib-doc}
+
+%description -n python3-matplotlib-doc
+%{summary}
+
 %package -n python3-matplotlib-test-data
 Summary:        Test data for python3-matplotlib
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-matplotlib-test-data}
 
 %description -n python3-matplotlib-test-data
 %{summary}
 
 
 %prep
-%autosetup -n matplotlib-%{version}%{?rctag} -N
-%patch0001 -p1
+%autosetup -n matplotlib-%{Version} -N
+
+# Upstream backported patches
+%patch1 -p1
 
 # Fedora-specific patches follow:
 %patch1001 -p1
 # Updated test images for new FreeType.
-gzip -dc %SOURCE1000 | tar xvf - --transform='s~^mpl-images-%{version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
-%ifnarch x86_64
 %patch1002 -p1
-%endif
-%ifarch aarch64 ppc64 ppc64le s390x
-%patch1004 -p1
-%endif
-%ifarch i686 armv7hl
-%patch1003 -p1
-%endif
-rm -r extern/libqhull
+gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
 
 # Copy setup.cfg to the builddir
-sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}
-
-# Keep this until next version, and increment if changing from
-# USE_FONTCONFIG to False or True so that cache is regenerated
-# if updated from a version enabling fontconfig to one not
-# enabling it, or vice versa
-if [ %{version} = 1.4.3 ]; then
-    sed -i 's/\(__version__ = 200\)/\1.1/' lib/matplotlib/font_manager.py
-fi
-
-%if !%{with_bundled_fonts}
-# Use fontconfig by default
-sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py
-%endif
+cp -p %{SOURCE1} setup.cfg
 
 
 %build
+%set_build_flags
 export http_proxy=http://127.0.0.1/
-MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
-  xvfb-run %{__python2} setup.py build
-%if %{with_html}
+
+MPLCONFIGDIR=$PWD %py3_build
+%if %{with html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 pushd doc
     MPLCONFIGDIR=$PWD/.. \
-    MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data \
     PYTHONPATH=`realpath ../build/lib.linux*` \
-        %{__python2} make.py html
+        %{python3} make.py html
 popd
 %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 '{}' \;
 
-MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
-  xvfb-run %{__python3} setup.py build
-# documentation cannot be built with python3 due to syntax errors
-# https://github.com/matplotlib/matplotlib/issues/5805
 
 %install
 export http_proxy=http://127.0.0.1/
-MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
-  %{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
-chmod +x %{buildroot}%{python2_sitearch}/matplotlib/dates.py
+
+MPLCONFIGDIR=$PWD %py3_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
+
+# Move files to Fedora-specific locations.
 mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
-mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data/matplotlibrc \
-   %{buildroot}%{_sysconfdir}
-mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data \
+mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \
    %{buildroot}%{_datadir}/matplotlib
-%if !%{with_bundled_fonts}
+%if %{without bundled_fonts}
 rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
 %endif
 
-MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
-    %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
-chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py
-rm -fr %{buildroot}%{python3_sitearch}/matplotlib/mpl-data
 
-%if %{run_tests}
+%if %{with check}
 %check
 # These files confuse pytest, and we want to test the installed copy.
 rm -rf build*/
 
+# 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
+
 export http_proxy=http://127.0.0.1/
-# This should match the default backend
-echo "backend      : %{backend}" > matplotlibrc
-# Full tests are not run because pytest doesn't seem to understand namespace
-# packages in PYTHONPATH.
 # Skips:
-#  * test_parasite: imports mpl_toolkits which is broken as noted above.
-#  * test_polycollection_close: imports mpl_toolkits which is broken as noted
-#    above.
 #  * test_invisible_Line_rendering: Checks for "slowness" that often fails on a
 #    heavily-loaded builder.
 MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
-PYTHONPATH=%{buildroot}%{python2_sitearch} \
-PYTHONDONTWRITEBYTECODE=1 \
-     xvfb-run -a -s "-screen 0 640x480x24" \
-         %{__python2} -m pytest --pyargs matplotlib -ra -n $(getconf _NPROCESSORS_ONLN) \
-             -m 'not network' \
-             -k 'not test_invisible_Line_rendering and not test_parasite and not test_polycollection_close and not test_nose_image_comparison'
-
-MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
 PYTHONDONTWRITEBYTECODE=1 \
      xvfb-run -a -s "-screen 0 640x480x24" \
-         %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
+         %{python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
              -m 'not network' \
-             -k 'not test_invisible_Line_rendering and not test_nose_image_comparison'
-
-# We run these separately because they have issues when run in parallel.
+             -k 'not test_invisible_Line_rendering and not Qt5Agg'
+# Run Qt5Agg tests separately to not conflict with Qt4 tests.
 MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
-PYTHONPATH=%{buildroot}%{python2_sitearch} \
-PYTHONDONTWRITEBYTECODE=1 \
-     xvfb-run -a -s "-screen 0 640x480x24" \
-         %{__python2} -m pytest --pyargs matplotlib -ra \
-             -k 'test_nose_image_comparison'
-MPLCONFIGDIR=$PWD \
-MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
 PYTHONDONTWRITEBYTECODE=1 \
      xvfb-run -a -s "-screen 0 640x480x24" \
-         %{__python3} tests.py -ra \
-             -k 'test_nose_image_comparison'
-%endif # run_tests
+         %{python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
+             -m 'not network' -k 'Qt5Agg'
+%endif
 
-%files -n python-matplotlib-data
-%{_sysconfdir}/matplotlibrc
+
+%files -n python3-matplotlib-data
 %{_datadir}/matplotlib/mpl-data/
-%if %{with_bundled_fonts}
+%if %{with bundled_fonts}
 %exclude %{_datadir}/matplotlib/mpl-data/fonts/
 %endif
 
-%if %{with_bundled_fonts}
-%files -n python-matplotlib-data-fonts
+%if %{with bundled_fonts}
+%files -n python3-matplotlib-data-fonts
 %{_datadir}/matplotlib/mpl-data/fonts/
 %endif
 
-%files -n python2-matplotlib
-%license LICENSE/
-%doc README.rst
-%{python2_sitearch}/*egg-info
-%{python2_sitearch}/matplotlib-*-nspkg.pth
-%{python2_sitearch}/matplotlib/
-%exclude %{python2_sitearch}/matplotlib/tests/baseline_images/*
-%{python2_sitearch}/mpl_toolkits/
-%exclude %{python2_sitearch}/mpl_toolkits/tests/baseline_images/*
-%{python2_sitearch}/pylab.py*
-%exclude %{python2_sitearch}/matplotlib/backends/backend_qt4*
-%exclude %{python2_sitearch}/matplotlib/backends/backend_qt5*
-%exclude %{python2_sitearch}/matplotlib/backends/backend_gtk*
-%exclude %{python2_sitearch}/matplotlib/backends/_gtkagg.*
-%exclude %{python2_sitearch}/matplotlib/backends/backend_tkagg.*
-%exclude %{python2_sitearch}/matplotlib/backends/tkagg.*
-%exclude %{python2_sitearch}/matplotlib/backends/_tkagg.so
-%exclude %{python2_sitearch}/matplotlib/backends/backend_wx.*
-%exclude %{python2_sitearch}/matplotlib/backends/backend_wxagg.*
-%exclude %{_pkgdocdir}/*
-%exclude %{_pkgdocdir}/*/*
-
-%files -n python2-matplotlib-test-data
-%{python2_sitearch}/matplotlib/tests/baseline_images/
-%{python2_sitearch}/mpl_toolkits/tests/baseline_images/
-
-%files -n python2-matplotlib-qt4
-%{python2_sitearch}/matplotlib/backends/backend_qt4.*
-%{python2_sitearch}/matplotlib/backends/backend_qt4agg.*
-
-%files -n python2-matplotlib-qt5
-%{python2_sitearch}/matplotlib/backends/backend_qt5.*
-%{python2_sitearch}/matplotlib/backends/backend_qt5agg.*
-
-%files -n python2-matplotlib-gtk
-%{python2_sitearch}/matplotlib/backends/backend_gtk.py*
-%{python2_sitearch}/matplotlib/backends/backend_gtkagg.py*
-%{python2_sitearch}/matplotlib/backends/backend_gtkcairo.py*
-%{python2_sitearch}/matplotlib/backends/_gtkagg.so
-
-%files -n python2-matplotlib-gtk3
-%{python2_sitearch}/matplotlib/backends/backend_gtk3*.py*
-
-%files -n python2-matplotlib-tk
-%{python2_sitearch}/matplotlib/backends/backend_tkagg.py*
-%{python2_sitearch}/matplotlib/backends/tkagg.py*
-%{python2_sitearch}/matplotlib/backends/_tkagg.so
-
-%files -n python2-matplotlib-wx
-%{python2_sitearch}/matplotlib/backends/backend_wx.*
-%{python2_sitearch}/matplotlib/backends/backend_wxagg.*
-
-%files -n python2-matplotlib-doc
+%files -n python3-matplotlib-doc
 %doc examples
-%if %{with_html}
+%if %{with html}
 %doc doc/build/html/*
 %endif
 
 %files -n python3-matplotlib
 %license LICENSE/
 %doc README.rst
-%{python3_sitearch}/*egg-info
+%{python3_sitearch}/matplotlib-*.egg-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/*
-%{python3_sitearch}/pylab.py*
-%{python3_sitearch}/__pycache__/*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_tkagg.*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
-%exclude %{python3_sitearch}/matplotlib/backends/tkagg.*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
+%pycached %{python3_sitearch}/pylab.py
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*.py
+%if %{without qt4}
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*.py
+%endif
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/_backend_tk.py
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_tk*.py
 %exclude %{python3_sitearch}/matplotlib/backends/_tkagg.*
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_wx*.py
 %exclude %{_pkgdocdir}/*/
 
 %files -n python3-matplotlib-test-data
 %{python3_sitearch}/matplotlib/tests/baseline_images/
 %{python3_sitearch}/mpl_toolkits/tests/baseline_images/
 
+%if %{with qt4}
 %files -n python3-matplotlib-qt4
-%{python3_sitearch}/matplotlib/backends/backend_qt4.*
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
-%{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt4.py
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt4agg.py
+%endif
 
+# This subpackage is empty because the Qt4 backend imports it, so we leave
+# these files in the default package, and only use this one for dependencies.
 %files -n python3-matplotlib-qt5
-%{python3_sitearch}/matplotlib/backends/backend_qt5.*
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*
-%{python3_sitearch}/matplotlib/backends/backend_qt5agg.*
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*
+%if %{without qt4}
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5.py
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5agg.py
+%endif
 
 %files -n python3-matplotlib-gtk3
-%{python3_sitearch}/matplotlib/backends/backend_gtk*
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
 
 %files -n python3-matplotlib-tk
-%{python3_sitearch}/matplotlib/backends/backend_tkagg.py*
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
-%{python3_sitearch}/matplotlib/backends/tkagg.*
-%{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_tk*.py
+%pycached %{python3_sitearch}/matplotlib/backends/_backend_tk.py
 %{python3_sitearch}/matplotlib/backends/_tkagg.*
 
+%if %{with wx}
+%files -n python3-matplotlib-wx
+%pycached %{python3_sitearch}/matplotlib/backends/backend_wx*.py
+%endif
+
 
 %changelog
+* Sun Jul 16 2023 Orion Poplawski <orion@nwra.com> - 3.4.3-4
+- Re-enable wx support (bz#2211203)
+
+* Sat Apr 15 2023 Carl George <carl@george.computer> - 3.4.3-3
+- Fix compatibility with Pillow 9.1
+
+* Wed Aug 25 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.3-2
+- Fix return type in get_data_path patch
+
+* Fri Aug 13 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.3-1
+- Update to latest version (#1993426)
+
+* Sat May 08 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.2-1
+- Update to latest version (#1958461)
+
+* Wed Mar 31 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.1-1
+- Update to latest version (#1943482)
+
+* Thu Mar 11 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc3-1
+- Update to latest release candidate
+
+* Fri Feb 19 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.4.0~rc1-1
+- Update to latest release candidate
+- Deprecated python3-matplotlib-qt4 subpackage
+
+* Tue Feb 16 2021 Troy Dawson <tdawson@redhat.com> - 3.3.4-3
+- Add build deps that were only getting pulled in by other dependencies
+
+* Mon Feb 01 2021 Tomas Popela <tpopela@redhat.com> - 3.3.4-2
+- Conditionalize the WX backend and disable it on RHEL 8+ as WX is not
+  available there.
+
+* Thu Jan 28 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.4-1
+- Update to latest version (#1921574)
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Dec 02 2020 Tomas Popela <tpopela@redhat.com> - 3.3.3-2
+- Don't build the Qt 4 backend in ELN/RHEL 9 as Qt 4 won't be available there
+  (reuse
+  https://src.fedoraproject.org/rpms/python-matplotlib/c/588e490738b06d525910f05bc1ba3f3f05ec7d50?branch=epel8)
+
+* Thu Nov 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.3-1
+- Update to latest version (#1897021)
+
+* Tue Sep 15 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.2-1
+- Update to latest version (#1878999)
+
+* Thu Aug 13 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.1-1
+- Update to latest version
+- Fixes RHBZ#1868838
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 18 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.0-1
+- Update to latest version
+- Fixes RHBZ#1858120
+
+* Tue Jun 30 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.0-0.2.rc1
+- Add more test dependencies
+
+* Mon Jun 29 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.3.0-0.1.rc1
+- Update to latest version
+
+* Sat Jun 20 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.2-1
+- Update to latest version
+
+* Mon Jun 01 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-2
+- Only recommend texlive-dvipng (but require it if texlive is installed) (#1509657)
+
+* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-1.1
+- Rebuilt for Python 3.9
+
+* Wed Mar 18 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.1-1
+- Update to latest version
+
+* Tue Mar 03 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.0-1
+- Update to latest version
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 22 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.2-1
+- Update to latest version
+
+* Fri Sep 06 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.1-2
+- Backport bool deprecation fix for Python 3.8
+
+* Sun Aug 18 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1-1.1
+- Rebuilt for Python 3.8
+
+* Thu Aug 08 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.1-1
+- Update to latest version
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul  3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.3-2
+- Update Obsoletes to be later than the last python2 builds (#1726490)
+
+* Sat Mar 02 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.3-1
+- Update to latest version
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Nov 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.2-1
+- Update to latest version
+
+* Wed Oct 31 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.1-1
+- Update to latest version
+
+* Fri Sep 21 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-2
+- Obsolete old python-matplotlib-data* to prevent conflicts and provide an upgrade path
+
+* Wed Sep 19 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.0-1
+- Update to latest version
+- Drop Python 2 subpackages
+- Stop setting a default backend (allow Matplotlib to choose automatically)
+
 * Mon Aug 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.3-1
 - Update to latest version
 

setup.cfg

@@ -1,7 +1,8 @@
+[libs]
+system_freetype = True
+system_qhull = True
+
 [packages]
 tests = True
 toolkits = True
 toolkits_tests = True
-
-[rc_options]
-backend = GTKAgg

sources

@@ -1,3 +1,2 @@
-SHA512 (matplotlib-2.2.3.tar.gz) = d118f5d56e2f578031aba22933c0b3a4423a31a04f50f08cc1aa660186546d09692a9cf401bb5f24cb296f94fbfd8707460728d501ac2bd4a624dfa89e92949b
-SHA512 (matplotlib-2.2.3-with-freetype-2.9.1.tar.gz) = 00f6d4eeab6d73108129a5ccbaccda37c2e8cc684efeeb03c492a96a2071357a32a624ebfef2770c8c205a3741ef8d947f117351d90d25c4c7b4b8b6b84db556
-SHA512 (matplotlib-2.2.3-with-freetype-2.8.tar.gz) = 7f11a0589f2ab5fcbdee0da0d4fa003c62b9e882fbae22a6bc725f791f3ea058b33321a70a5cf1858f494aa1ebb8b3e686c56ff73e6174fb980e159331bd0a0d
+SHA512 (matplotlib-3.4.3.tar.gz) = e346c7d0f33b7d2fb5b48a4578ec99a40c2e5b959d109526ccbe7582a37f10abb91d53062711c37eb4ccaf462fd8684e1557405c50ccf43139bc371601a60e80
+SHA512 (matplotlib-3.4.3-with-freetype-2.10.4.tar.gz) = 665870e9c34fa562c69c28432b6d378e02c63ff2b14a34f982a16c89ecdb3b012cdf3306e84a052d689710f2ddff069c8a207b63971c73e5c867d6562e1f6241