Re-enable wx support (bz#2211203)

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

.gitignore

@@ -0,0 +1,70 @@
+matplotlib-1.0.0-without-gpc.tar.gz
+/matplotlib-1.0.1-without-gpc.tar.gz
+/mpl_sampledata-1.0.1.tar.gz
+/matplotlib-1.2.0-without-gpc.tar.gz
+/matplotlib-1.3.0-without-gpc.tar.xz
+/matplotlib-1.3.1-without-gpc.tar.xz
+/matplotlib-1.4.3-without-gpc.tar.xz
+/matplotlib-1.4.3-without-extern.tar.xz
+/matplotlib-1.5.1-without-extern.tar.xz
+/matplotlib-1.5.1.tar.gz
+/matplotlib-1.5.2rc2.tar.gz
+/matplotlib-2.0.0b4.tar.gz
+/matplotlib-2.0.0rc2.tar.gz
+/matplotlib-2.0.0.tar.gz
+/matplotlib-2.0.0-without-copyrighted.tar.xz
+/matplotlib-2.0.1.tar.gz
+/matplotlib-2.0.2.tar.gz
+/matplotlib-2.1.0rc1.tar.gz
+/matplotlib-2.1.0.tar.gz
+/matplotlib-2.1.1.tar.gz
+/matplotlib-2.1.2.tar.gz
+/matplotlib-2.1.2-with-freetype-2.8.tar.gz
+/matplotlib-2.2.2.tar.gz
+/matplotlib-2.2.2-with-freetype-2.8.tar.gz
+/matplotlib-2.2.2-with-freetype-2.9.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-matplotlibrc-path-search-fix.patch

@@ -0,0 +1,43 @@
+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/2] matplotlibrc path search fix
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ 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 71c68a3d6b..88be8e97b0 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -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')
+ 
+ 
+ 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.
+     """
+@@ -511,6 +513,7 @@ def matplotlib_fname():
+             yield matplotlibrc
+             yield os.path.join(matplotlibrc, 'matplotlibrc')
+         yield os.path.join(get_configdir(), 'matplotlibrc')
++        yield '/etc/matplotlibrc'
+         yield os.path.join(get_data_path(), 'matplotlibrc')
+ 
+     for fname in gen_candidates():
+-- 
+2.31.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
+

dead.package

@@ -1 +0,0 @@
-epel8-playground decommissioned : https://pagure.io/epel/issue/136

setup.cfg

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

sources

@@ -0,0 +1,2 @@
+SHA512 (matplotlib-3.4.3.tar.gz) = e346c7d0f33b7d2fb5b48a4578ec99a40c2e5b959d109526ccbe7582a37f10abb91d53062711c37eb4ccaf462fd8684e1557405c50ccf43139bc371601a60e80
+SHA512 (matplotlib-3.4.3-with-freetype-2.10.4.tar.gz) = 665870e9c34fa562c69c28432b6d378e02c63ff2b14a34f982a16c89ecdb3b012cdf3306e84a052d689710f2ddff069c8a207b63971c73e5c867d6562e1f6241