Update to 3.3.4.

- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-28 04:31:52 -05:00 · 2021-01-27 11:38:22 +00:00 · 2021-01-27 01:26:04 -05:00 · 2021-01-21 02:22:27 -05:00 · 2020-12-02 15:49:09 +01:00 · 2020-11-12 19:51:34 -05:00
11 changed files with 495 additions and 1516 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,35 @@ 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-2.2.4.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
--- a/0001-Force-using-system-qhull.patch
+++ b/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
--- a/0001-Use-packaged-jquery-and-jquery-ui.patch
+++ b/0001-Use-packaged-jquery-and-jquery-ui.patch
@@ -1,116 +0,0 @@
 From d873c282f4ab93f14c6b4ac6f4210852024dba78 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Sat, 2 Mar 2019 18:18:29 -0500
 Subject: [PATCH] Use packaged jquery and jquery-ui.
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 .../backends/web_backend/all_figures.html     |  6 +--
 .../backends/web_backend/single_figure.html   |  6 +--
 setup.py                                      | 49 -------------------
 3 files changed, 6 insertions(+), 55 deletions(-)
 diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html
 index 41f48dc6d..69097eb4f 100644
 --- a/lib/matplotlib/backends/web_backend/all_figures.html
 +++ b/lib/matplotlib/backends/web_backend/all_figures.html
@@ -3,9 +3,9 @@
     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
 -    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
 +    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
 +    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
 +    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
     <script src="{{ prefix }}/js/mpl.js"></script>
 diff --git a/lib/matplotlib/backends/web_backend/single_figure.html b/lib/matplotlib/backends/web_backend/single_figure.html
 index 4d5a366fb..c11c86618 100644
 --- a/lib/matplotlib/backends/web_backend/single_figure.html
 +++ b/lib/matplotlib/backends/web_backend/single_figure.html
@@ -3,9 +3,9 @@
     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
 -    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
 +    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
 +    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
 +    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
     <script src="{{ prefix }}/js/mpl.js"></script>
     <script>
 diff --git a/setup.py b/setup.py
 index 41037e95d..7a0af717f 100644
 --- a/setup.py
 +++ b/setup.py
@@ -35,8 +35,6 @@ from zipfile import ZipFile
 from setuptools import setup
 from setuptools.command.build_ext import build_ext as BuildExtCommand
 -from setuptools.command.develop import develop as DevelopCommand
 -from setuptools.command.install_lib import install_lib as InstallLibCommand
 from setuptools.command.test import test as TestCommand
 # The setuptools version of sdist adds a setup.cfg file to the tree.
@@ -146,53 +144,6 @@ cmdclass['test'] = NoopTestCommand
 cmdclass['build_ext'] = BuildExtraLibraries
 -def _download_jquery_to(dest):
 -    # Note: When bumping the jquery-ui version, also update the versions in
 -    # single_figure.html and all_figures.html.
 -    url = "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
 -    sha = 'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
 -    if not os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
 -        _makedirs(dest, exist_ok=True)
 -        try:
 -            buff = download_or_cache(url, sha)
 -        except Exception:
 -            raise IOError("Failed to download jquery-ui.  Please download " +
 -                          "{url} and extract it to {dest}.".format(
 -                              url=url, dest=dest))
 -        with ZipFile(buff) as zf:
 -            zf.extractall(dest)
 -
 -
 -# Relying on versioneer's implementation detail.
 -_orgin_sdist = cmdclass['sdist']
 -
 -
 -class sdist_with_jquery(_orgin_sdist):
 -    def make_release_tree(self, base_dir, files):
 -        _orgin_sdist.make_release_tree(self, base_dir, files)
 -        _download_jquery_to(
 -            os.path.join(base_dir, "lib/matplotlib/backends/web_backend/"))
 -
 -
 -# Affects install and bdist_wheel.
 -class install_lib_with_jquery(InstallLibCommand):
 -    def run(self):
 -        InstallLibCommand.run(self)
 -        _download_jquery_to(
 -            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
 -
 -
 -class develop_with_jquery(DevelopCommand):
 -    def run(self):
 -        DevelopCommand.run(self)
 -        _download_jquery_to("lib/matplotlib/backends/web_backend/")
 -
 -
 -cmdclass['sdist'] = sdist_with_jquery
 -cmdclass['install_lib'] = install_lib_with_jquery
 -cmdclass['develop'] = develop_with_jquery
 -
 -
 # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
 # however, this is needed on Windows to avoid creating infinite subprocesses
 # when using multiprocessing.
 -- 
 2.20.1
--- a/0001-matplotlibrc-path-search-fix.patch
+++ b/0001-matplotlibrc-path-search-fix.patch
@@ -1,97 +1,69 @@
-From 84ebbed32cf1c0f4d56a6191ce7470fda6ea0543 Mon Sep 17 00:00:00 2001
+From 7d34e4c6cf3e9f0b68d0a7f70f5c832a24b74d7e 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/__init__.py | 28 ++++------------------------
- lib/matplotlib/tests/test_rcparams.py | 22 ++++++++++++++++------
+ 1 file changed, 4 insertions(+), 24 deletions(-)
 2 files changed, 21 insertions(+), 9 deletions(-)
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index c5accc3c3..bc38f316c 100644
+index 1c47973f15..202acce525 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -738,9 +738,12 @@ def _get_data_path():
+@@ -536,33 +536,11 @@ def get_data_path(*, _from_rc=None):
-     _file = _decode_filesystem_path(__file__)
+ @_logged_cached('(private) matplotlib data path: %s')
-     path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
+ def _get_data_path():
-+    path = '/usr/share/matplotlib/mpl-data'
+-    path = Path(__file__).with_name("mpl-data")
-     if os.path.isdir(path):
+    path = (Path(__file__).parent.parent.parent.parent.parent /
-         return path
+            'share/matplotlib/mpl-data')
     if path.is_dir():
         return str(path)
-+    raise RuntimeError('Could not find the matplotlib data files')
+-    cbook.warn_deprecated(
-+
+-        "3.2", message="Matplotlib installs where the data is not in the "
-     # setuptools' namespace_packages may highjack this init file
+-        "mpl-data subdirectory of the package are deprecated since %(since)s "
-     # so need to try something known to be in matplotlib, not basemap
+-        "and support for them will be removed %(removal)s.")
-     import matplotlib.afm
+-
-@@ -821,8 +824,7 @@ def matplotlib_fname():
+-    def get_candidate_paths():
 -        # setuptools' namespace_packages may hijack this init file
 -        # so need to try something known to be in Matplotlib, not basemap.
 -        import matplotlib.afm
 -        yield Path(matplotlib.afm.__file__).with_name('mpl-data')
 -        # py2exe zips pure python, so still need special check.
 -        if getattr(sys, 'frozen', None):
 -            yield Path(sys.executable).with_name('mpl-data')
 -            # Try again assuming we need to step up one more directory.
 -            yield Path(sys.executable).parent.with_name('mpl-data')
 -            # Try again assuming sys.path[0] is a dir not a exe.
 -            yield Path(sys.path[0]) / 'mpl-data'
 -
 -    for path in get_candidate_paths():
 -        if path.is_dir():
 -            defaultParams['datapath'][0] = str(path)
 -            return str(path)
 -
     raise RuntimeError('Could not find the matplotlib data files')
          - `$HOME/.matplotlib/matplotlibrc` if `$HOME` is defined.
-    - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
+@@ -583,6 +561,7 @@ def matplotlib_fname():
-      system-defined copy.
+           is not defined)
-+    - Lastly, it looks in `/etc/matplotlibrc` for a system-defined copy.
+     - On other platforms,
       - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
 +    - ``/etc/matplotlibrc``
     - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
       exist.
     """
- 
+@@ -597,6 +576,7 @@ def matplotlib_fname():
     def gen_candidates():
@@ -835,7 +837,7 @@ def matplotlib_fname():
             yield matplotlibrc
             yield os.path.join(matplotlibrc, 'matplotlibrc')
-         yield os.path.join(_get_configdir(), 'matplotlibrc')
+         yield os.path.join(get_configdir(), 'matplotlibrc')
 -        yield os.path.join(get_data_path(), '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.20.1
+2.29.2
--- a/0002-Increase-tolerances-for-non-x86_64-arches.patch
+++ b/0002-Increase-tolerances-for-non-x86_64-arches.patch
@@ -1,27 +0,0 @@
 From 95035beb712088f9b66aae9cc810a1a94685d0da 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.20.1
--- a/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch
+++ b/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch
@@ -0,0 +1,120 @@
 From 40ed55c16c0d3f7d2365af5c6a8f99e02eadae31 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_polar.py             |  2 +-
 lib/matplotlib/tests/test_tightlayout.py       | 10 +++++-----
 setupext.py                                    |  6 +++++-
 6 files changed, 15 insertions(+), 11 deletions(-)
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
 index 202acce525..18731b7c4d 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
@@ -1198,7 +1198,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 e0b340da1e..9090c2930c 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
@@ -6055,7 +6055,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],
@@ -6073,7 +6073,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 46e6b9663e..593b3fb3ee 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -398,4 +398,4 @@ def test_hidden_axes():
     extents1 = np.copy(axs[0, 0].get_position().extents)
     np.testing.assert_allclose(
 -        extents1, [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-5)
 +        extents1, [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-2)
 diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py
 index da9a77c825..a7a98ef59e 100644
 --- a/lib/matplotlib/tests/test_polar.py
 +++ b/lib/matplotlib/tests/test_polar.py
@@ -314,7 +314,7 @@ def test_get_tightbbox_polar():
     fig.canvas.draw()
     bb = ax.get_tightbbox(fig.canvas.get_renderer())
     assert_allclose(
 -        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1e-03)
 +        bb.extents, [107.7778,  29.2778, 539.7847, 450.7222], rtol=1)
 @check_figures_equal(extensions=["png"])
 diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
 index 9ad2e0a9a0..7c9085a314 100644
 --- a/lib/matplotlib/tests/test_tightlayout.py
 +++ b/lib/matplotlib/tests/test_tightlayout.py
@@ -171,12 +171,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 dfa004d7f0..8ec77feed9 100644
 --- a/setupext.py
 +++ b/setupext.py
@@ -129,12 +129,16 @@ _freetype_hashes = {
         '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
     '2.10.1':
         '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110',
 +    '2.10.2':
 +        'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab',
 +    '2.10.4':
 +        '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac',
 }
 # 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')
 -- 
 2.29.2
--- a/0003-Increase-some-tolerances-for-32-bit-systems.patch
+++ b/0003-Increase-some-tolerances-for-32-bit-systems.patch
@@ -1,567 +0,0 @@
 From bcb05f18d78d2a467ddc9cdb0e6bcebd41116ee5 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 d008446dc..2d930cacc 100644
 --- a/lib/matplotlib/testing/decorators.py
 +++ b/lib/matplotlib/testing/decorators.py
@@ -418,7 +418,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 dde856669..5cfd4151a 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))
@@ -3944,7 +3943,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
@@ -4803,7 +4802,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 = {
@@ -5298,7 +5297,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 c8a23347f..5a23ded19 100644
 --- a/lib/matplotlib/tests/test_image.py
 +++ b/lib/matplotlib/tests/test_image.py
@@ -761,7 +761,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 af6701a0f..151b061a5 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 d6e57b9b4..c3ac37a7f 100644
 --- a/lib/mpl_toolkits/tests/test_mplot3d.py
 +++ b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -226,7 +226,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
@@ -705,7 +705,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.20.1
--- a/0003-Increase-some-tolerances-for-non-x86-arches.patch
+++ b/0003-Increase-some-tolerances-for-non-x86-arches.patch
@@ -1,278 +0,0 @@
 From 8f2ae0000d8f593fc82243b056ecf57c81059a42 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 dde856669..de1632fc4 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
@@ -3264,7 +3264,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))
@@ -4997,7 +4998,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 8cd4585bf..29b2c4b46 100644
 --- a/lib/matplotlib/tests/test_backends_interactive.py
 +++ b/lib/matplotlib/tests/test_backends_interactive.py
@@ -57,4 +57,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 c8a23347f..afb36587c 100644
 --- a/lib/matplotlib/tests/test_image.py
 +++ b/lib/matplotlib/tests/test_image.py
@@ -761,7 +761,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.20.1
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -1,15 +1,17 @@
-%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
+# No qt4 for EL8/ELN/EL9
-# build (often aarch64 or ppc64) will fail in one of the Stix font
+%if 0%{?rhel} >= 8
-# tests with a huge RMS difference, but if you run the same build again,
+%bcond_with qt4
-# you won't get the same error. Unless someone can figure out what's
+%else
-# going on, we just have to keep re-running the build until it doesn't
+%bcond_without qt4
-# happen.
+%endif
 %global run_tests               1
-# the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
+# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
-# CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
+# WXAgg Agg Cairo PS PDF SVG
 %global backend                 TkAgg
 %if "%{backend}" == "TkAgg"
@@ -20,262 +22,145 @@
 %  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 2.2.3
+%global mpl_images_version 3.3.3
 # The version of FreeType in this Fedora branch.
-%if %{fedora} >= 29
+%global ftver 2.10.4
 %global ftver 2.9.1
 %else
 %global ftver 2.8
 %endif
 Name:           python-matplotlib
-Version:        2.2.4
+Version:        3.3.4
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+%global Version 3.3.4
 Release:        1%{?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
 # Don't attempt to download jQuery and jQuery UI
 Patch0002:      0001-Use-packaged-jquery-and-jquery-ui.patch
 # Fedora-specific patches; see:
-# https://github.com/QuLogic/matplotlib/tree/fedora-patches
+# https://github.com/fedora-python/matplotlib/tree/fedora-patches
 # https://github.com/QuLogic/matplotlib/tree/fedora-patches-non-x86
 # Updated test images for new FreeType.
 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:
+# Increase tolerances for new FreeType everywhere:
-Patch1002:      0002-Increase-tolerances-for-non-x86_64-arches.patch
+Patch1002:      0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.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
 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
 BuildRequires:  ImageMagick
 %ifnarch s390x
 BuildRequires:  inkscape
 %endif
 BuildRequires:  texlive-dvipng
 BuildRequires:  texlive-latex-bin
 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(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
+environments across platforms. Matplotlib can be used in Python
-scripts, the python and ipython shell, web application servers, and
+scripts, the Python and IPython shell, web application servers, and
-six graphical user interface toolkits.
+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
+%package -n python3-matplotlib-data
 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
 Summary:        Data used by python-matplotlib
 BuildArch:      noarch
-%if %{with_bundled_fonts}
+%if %{with bundled_fonts}
-Requires:       python-matplotlib-data-fonts = %{version}-%{release}
+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}
+%if %{with bundled_fonts}
-%package -n python-matplotlib-data-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}
+Requires:       python3-matplotlib-data = %{version}-%{release}
-%{?python_provide:%python_provide python-matplotlib-data-fonts}
+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
@@ -286,53 +171,54 @@ BuildRequires:  python3-numpy
 BuildRequires:  python3-pillow
 BuildRequires:  python3-pyparsing
 BuildRequires:  python3-pytz
 BuildRequires:  python3-six
 BuildRequires:  python3-sphinx
 Requires:       dejavu-sans-fonts
-Requires:       dvipng
+Recommends:     texlive-dvipng
-Requires:       python-matplotlib-data = %{version}-%{release}
+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
+%if %{without bundled_fonts}
 Requires:       python3-six
 %if !%{with_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
+environments across platforms. Matplotlib can be used in Python
-scripts, the python and ipython shell, web application servers, and
+scripts, the Python and IPython shell, web application servers, and
-six graphical user interface toolkits.
+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}
 %description -n python3-matplotlib-qt4
 %{summary}
 %endif
 %package -n     python3-matplotlib-qt5
 Summary:        Qt5 backend for python3-matplotlib
@@ -344,7 +230,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
@@ -353,7 +238,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}
@@ -363,277 +247,280 @@ 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}
 %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}
 %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
+%autosetup -n matplotlib-%{Version} -N
 %patch0001 -p1
 %patch0002 -p1
 # Fedora-specific patches follow:
 %patch1001 -p1
 # Updated test images for new FreeType.
 gzip -dc %SOURCE1000 | tar xvf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
 %ifnarch x86_64
 %patch1002 -p1
-%endif
+gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
 %ifarch aarch64 ppc64 ppc64le s390x
 %patch1004 -p1
 %endif
 %ifarch i686 armv7hl
 %patch1003 -p1
 %endif
 rm -r extern/libqhull
 # Copy setup.cfg to the builddir
-sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}
+cp -p %{SOURCE1} setup.cfg
 # 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
 %build
 %set_build_flags
 export http_proxy=http://127.0.0.1/
-MPLCONFIGDIR=$PWD \
+
-MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
+MPLCONFIGDIR=$PWD %py3_build
-  xvfb-run %{__python2} setup.py build
+%if %{with html}
 %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/ \
+MPLCONFIGDIR=$PWD %py3_install
  %{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
 chmod +x %{buildroot}%{python2_sitearch}/matplotlib/dates.py
 mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
-mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data/matplotlibrc \
+mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \
   %{buildroot}%{_sysconfdir}
 mv %{buildroot}%{python2_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 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'
+             -k 'not test_invisible_Line_rendering and not Qt5Agg'
-
+# Run Qt5Agg tests separately to not conflict with Qt4 tests.
 # We run these separately because they have issues when run in parallel.
 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 \
+         %{python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
-             -k 'test_nose_image_comparison'
+             -m 'not network' -k 'Qt5Agg'
-%endif # run_tests
+%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}
+%if %{with bundled_fonts}
-%files -n python-matplotlib-data-fonts
+%files -n python3-matplotlib-data-fonts
 %{_datadir}/matplotlib/mpl-data/fonts/
 %endif
-%files -n python2-matplotlib
+%files -n python3-matplotlib-doc
 %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
 %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*
+%pycached %{python3_sitearch}/pylab.py
-%{python3_sitearch}/__pycache__/*
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*.py
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*
+%if %{without qt4}
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4*
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*.py
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*
+%endif
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5*
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
-%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/_backend_tk.py
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
+%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_tk*.py
 %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.*
 %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.*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt4.py
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt4agg.py
-%{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
+%endif
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
 # 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.*
+%if %{without qt4}
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5.py
-%{python3_sitearch}/matplotlib/backends/backend_qt5agg.*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5agg.py
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*
+%endif
 %files -n python3-matplotlib-gtk3
-%{python3_sitearch}/matplotlib/backends/backend_gtk*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
 %files -n python3-matplotlib-tk
-%{python3_sitearch}/matplotlib/backends/backend_tkagg.py*
+%pycached %{python3_sitearch}/matplotlib/backends/backend_tk*.py
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
+%pycached %{python3_sitearch}/matplotlib/backends/_backend_tk.py
 %{python3_sitearch}/matplotlib/backends/tkagg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
 %{python3_sitearch}/matplotlib/backends/_tkagg.*
 %files -n python3-matplotlib-wx
 %pycached %{python3_sitearch}/matplotlib/backends/backend_wx*.py
 %changelog
 * 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
--- a/setup.cfg
+++ b/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
--- a/5
+++ b/5
@@ -1,3 +1,2 @@
-SHA512 (matplotlib-2.2.4.tar.gz) = c4ceb75314c303d310410683180dbe950223c7f054fc19739c49eaede46f183075ea402e7305843552fae75af3c55560f9e5c5549994cf5fce34f07ad6f3c720
+SHA512 (matplotlib-3.3.4.tar.gz) = e29bcd17ea2b65c26c75421a319d3f21c5b0148c9e61d55d719c191c07342ed19032f97cde269647bd545ed45b5e142483e50caf29ffd421acde5b0b3bfa238b
-SHA512 (matplotlib-2.2.3-with-freetype-2.9.1.tar.gz) = 00f6d4eeab6d73108129a5ccbaccda37c2e8cc684efeeb03c492a96a2071357a32a624ebfef2770c8c205a3741ef8d947f117351d90d25c4c7b4b8b6b84db556
+SHA512 (matplotlib-3.3.3-with-freetype-2.10.4.tar.gz) = b583842a24edc5deb39a3182797199081500fb089bff467a9e55d3612d8c049d43ed08385d42060271928f5cb02240599c7173a65c213fae9bafb2081c54c5a1
 SHA512 (matplotlib-2.2.3-with-freetype-2.8.tar.gz) = 7f11a0589f2ab5fcbdee0da0d4fa003c62b9e882fbae22a6bc725f791f3ea058b33321a70a5cf1858f494aa1ebb8b3e686c56ff73e6174fb980e159331bd0a0d
Author	SHA1	Message	Date
Elliott Sales de Andrade	171d221430	Update to 3.3.4.	2021-01-28 04:31:52 -05:00
Fedora Release Engineering	2b82ad2a3b	- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-01-27 11:38:22 +00:00
Elliott Sales de Andrade	98cb5a1a9b	Fix bug with running LaTeX tests in parallel.	2021-01-27 01:26:04 -05:00
Elliott Sales de Andrade	ac8946e2f5	Merge remote-tracking branch 'refs/remotes/origin/master'	2021-01-21 02:22:27 -05:00
Tomas Popela	4cdf22e67a	Don't build the Qt 4 backend in ELN/RHEL 9 as Qt 4 won't be available there Reuse `588e490738`	2020-12-02 15:49:09 +01:00
Elliott Sales de Andrade	7da34af983	Remove an old patch.	2020-11-12 19:51:34 -05:00
Elliott Sales de Andrade	c24355dafa	Update to latest version.	2020-11-12 01:35:38 -05:00
Elliott Sales de Andrade	e3697cc92e	Update to 3.3.2.	2020-09-15 04:15:49 -04:00
Elliott Sales de Andrade	3995507d1b	Update to latest version.	2020-08-25 01:54:22 -04:00
Elliott Sales de Andrade	ad9824fe33	Re-enable wx test on ppc64le. The bug appears to have been fixed.	2020-08-13 04:11:19 -04:00
Fedora Release Engineering	f853587a87	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-29 02:04:15 +00:00
Elliott Sales de Andrade	4524214523	Modernize some macro usage.	2020-07-19 02:41:39 -04:00
Elliott Sales de Andrade	26c79f2797	Update to latest version.	2020-07-19 02:41:37 -04:00
Elliott Sales de Andrade	c7c1d89af8	Don't install Inkscape on s390x. It appears to be buggy and produce incorrect test results.	2020-06-30 21:09:32 -04:00
Elliott Sales de Andrade	9d428b07ae	Add more test dependencies.	2020-06-30 05:42:19 -04:00
Elliott Sales de Andrade	037e6aee2b	Update to 3.3.0rc1.	2020-06-29 20:38:52 -04:00
Elliott Sales de Andrade	02546b29b2	Make texlive dependencies more explicit.	2020-06-20 05:02:11 -04:00
Elliott Sales de Andrade	107b5a1d51	Sort texlive packages, by type, then name.	2020-06-20 04:48:13 -04:00
Elliott Sales de Andrade	8d41fb7796	Remove old file exclusions.	2020-06-20 04:28:59 -04:00
Elliott Sales de Andrade	d52452b8de	Merge branch 'f32'	2020-06-20 04:22:53 -04:00
Elliott Sales de Andrade	ec400d341f	Update patches for non-x86.	2020-06-20 03:52:08 -04:00
Elliott Sales de Andrade	bea895839b	Update to latest version.	2020-06-20 03:06:07 -04:00
Miro Hrončok	713ad4038b	Only recommend texlive-dvipng (but require it if texlive is installed) Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1509657 See also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/ZGQJOTPJLK4JDB763ZS2MM46BDDKUGA3/	2020-06-02 11:48:59 +02:00
Miro Hrončok	d613f4be7e	Rebuilt for Python 3.9	2020-05-25 16:22:25 +02:00
Miro Hrončok	f5b673f304	Add explicit texlive BRs	2020-05-21 16:04:47 +02:00
Elliott Sales de Andrade	3fa499ba45	Update to latest version.	2020-03-18 03:28:30 -04:00
Elliott Sales de Andrade	ea129e4586	Fix a flaky test.	2020-03-04 00:35:37 -05:00
Elliott Sales de Andrade	e6f3591340	Update to 3.2.0.	2020-03-03 23:05:44 -05:00
Fedora Release Engineering	304a359289	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-30 13:17:29 +00:00
Miro Hrončok	8d98548134	Use supported attribute to check pillow version Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1789664	2020-01-22 13:05:01 +01:00
Elliott Sales de Andrade	1f37c6ab3a	Update to 3.1.2.	2019-11-22 20:10:32 -05:00
Elliott Sales de Andrade	c533793071	Backport bool deprecation warning fix.	2019-09-06 21:15:41 -04:00
Miro Hrončok	e8c7e2c6d2	Revert "Temporarily skip the tests" This reverts commit `cb1f3493dc`.	2019-08-18 20:58:48 +02:00
Miro Hrončok	cb1f3493dc	Temporarily skip the tests	2019-08-18 20:43:21 +02:00
Miro Hrončok	3009a9a10c	Rebuilt for Python 3.8	2019-08-18 20:19:46 +02:00
Miro Hrončok	685e53f794	BuildRequire glibc-langpack-en This avoids: WARNING matplotlib.testing:__init__.py:39 Could not set locale to English/United States. Some date-related tests may fail.	2019-08-13 11:28:10 +02:00
Elliott Sales de Andrade	c4446bc9c0	Skip wx test on ppc64le. See https://bugzilla.redhat.com/show_bug.cgi?id=1738752.	2019-08-08 01:22:32 -04:00
Elliott Sales de Andrade	2441db0faa	Backport patch for NumPy 1.17.	2019-08-07 21:51:04 -04:00
Elliott Sales de Andrade	9046bbb237	Update to 3.1.1 and FreeType 2.10.0.	2019-08-07 21:26:57 -04:00
Fedora Release Engineering	3652785c8e	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-26 14:28:02 +00:00
Zbigniew Jędrzejewski-Szmek	6ae3a9e1d1	Remove comment after %endif RPM 4.15 complains.	2019-07-03 11:55:57 +02:00
Zbigniew Jędrzejewski-Szmek	831ec4cba0	Update Obsoletes to be later than the last python2 builds	2019-07-03 11:55:18 +02:00
Miro Hrončok	49e6227f01	Skip test_tinypages tmpdir = local('/tmp/pytest-of-mockbuild/pytest-0/popen-gw2/test_tinypages0') def test_tinypages(tmpdir): html_dir = pjoin(str(tmpdir), 'html') doctree_dir = pjoin(str(tmpdir), 'doctrees') # Build the pages with warnings turned into errors cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', '-d', doctree_dir, pjoin(dirname(__file__), 'tinypages'), html_dir] proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True) out, err = proc.communicate() assert proc.returncode == 0, \ "sphinx build failed with stdout:\n{}\nstderr:\n{}\n".format(out, err) if err: pytest.fail("sphinx build emitted the following warnings:\n{}" > .format(err)) E Failed: sphinx build emitted the following warnings: E /usr/lib/python3.7/site-packages/sphinx/util/docutils.py:311: RemovedInSphinx30Warning: function based directive support is now deprecated. Use class based directive instead. E RemovedInSphinx30Warning) ../../BUILDROOT/python-matplotlib-3.0.3-1.fc31.x86_64/usr/lib64/python3.7/site-packages/matplotlib/sphinxext/tests/test_tinypages.py:28: Failed	2019-04-23 13:33:26 +02:00
Miro Hrončok	120f1b74da	Support pytest 4	2019-04-23 13:33:26 +02:00
Elliott Sales de Andrade	b5e6655ad8	Update to latest version.	2019-03-04 04:05:00 -05:00
Miro Hrončok	6e771d1530	https://fedoraproject.org/wiki/Changes/Python_Extension_Flags	2019-02-13 00:54:28 +01:00
Fedora Release Engineering	b1b97b1ed1	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-02 07:42:18 +00:00
Elliott Sales de Andrade	17130085de	Fix missing changelog.	2018-11-13 19:36:37 -05:00
Elliott Sales de Andrade	f171297f40	Update to latest version.	2018-11-10 04:33:30 -05:00
Elliott Sales de Andrade	af995aa143	Upload sources for 3.0.1.	2018-10-31 05:07:20 -04:00
Elliott Sales de Andrade	308245a86e	Remove unused patch.	2018-10-31 04:51:30 -04:00
Elliott Sales de Andrade	7424178997	Update to 3.0.1.	2018-10-31 04:07:46 -04:00
Miro Hrončok	cc106d1c4a	Obsolete old python-matplotlib-data* to prevent conflicts and provide an upgrade path	2018-09-21 12:29:49 +02:00
Elliott Sales de Andrade	7901631a85	Add correct license for bundled fonts.	2018-09-21 04:25:34 -04:00
Elliott Sales de Andrade	b4eba4ae21	Rename *data packages to avoid conflict with python2.	2018-09-19 14:47:47 -04:00
Elliott Sales de Andrade	b8683378dd	Update changelog.	2018-09-19 14:46:05 -04:00
Elliott Sales de Andrade	9fde50abab	Stop setting a default backend. It will be picked automatically by Matplotlib.	2018-09-19 14:42:58 -04:00
Elliott Sales de Andrade	ed3fa9581d	Remove unnecessary dependencies.	2018-09-19 04:39:50 -04:00
Elliott Sales de Andrade	c08eccf6ad	Run Qt5 tests separately to not conflict with Qt4.	2018-09-19 03:23:05 -04:00
Elliott Sales de Andrade	a0fbf93967	Add patch to fix Qt4 backends.	2018-09-18 23:52:36 -04:00
Elliott Sales de Andrade	6f3ec368b4	Stop setting explicit backend during testing.	2018-09-18 22:01:33 -04:00
Elliott Sales de Andrade	d2fa0263b8	Update to final 3.0.0.	2018-09-18 04:51:42 -04:00
Elliott Sales de Andrade	c385e2c1a9	Update to 3.0.0rc2.	2018-08-29 00:38:38 -04:00
Elliott Sales de Andrade	6995ee3297	Update backend package splits. There is a WX backend that was never split, and without its proper dependencies. Also, there are new *Cairo backends in this version.	2018-08-28 03:17:29 -04:00
Elliott Sales de Andrade	19b5ff96fa	Remove old Fedora FreeType support. This will not be built on Fedora < 29.	2018-08-28 03:17:29 -04:00
Elliott Sales de Andrade	1dcb7afa2a	Update to 3.0.0rc1.	2018-08-28 03:17:28 -04:00
Elliott Sales de Andrade	ee42f59462	Add explicit gcc/gcc-c++ BR.	2018-08-18 02:15:48 -04:00
Elliott Sales de Andrade	8293bc2589	Remove Python 2 subpackages.	2018-08-18 02:15:45 -04:00