Remove comment after %endif

RPM 4.15 complains.

.gitignore

@@ -2,3 +2,37 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-1.0.1-without-gpc.tar.gz
 /mpl_sampledata-1.0.1.tar.gz
 /matplotlib-1.2.0-without-gpc.tar.gz
+/matplotlib-1.3.0-without-gpc.tar.xz
+/matplotlib-1.3.1-without-gpc.tar.xz
+/matplotlib-1.4.3-without-gpc.tar.xz
+/matplotlib-1.4.3-without-extern.tar.xz
+/matplotlib-1.5.1-without-extern.tar.xz
+/matplotlib-1.5.1.tar.gz
+/matplotlib-1.5.2rc2.tar.gz
+/matplotlib-2.0.0b4.tar.gz
+/matplotlib-2.0.0rc2.tar.gz
+/matplotlib-2.0.0.tar.gz
+/matplotlib-2.0.0-without-copyrighted.tar.xz
+/matplotlib-2.0.1.tar.gz
+/matplotlib-2.0.2.tar.gz
+/matplotlib-2.1.0rc1.tar.gz
+/matplotlib-2.1.0.tar.gz
+/matplotlib-2.1.1.tar.gz
+/matplotlib-2.1.2.tar.gz
+/matplotlib-2.1.2-with-freetype-2.8.tar.gz
+/matplotlib-2.2.2.tar.gz
+/matplotlib-2.2.2-with-freetype-2.8.tar.gz
+/matplotlib-2.2.2-with-freetype-2.9.tar.gz
+/matplotlib-2.2.3.tar.gz
+/matplotlib-2.2.3-with-freetype-2.8.tar.gz
+/matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.0rc1.tar.gz
+/matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.0rc2.tar.gz
+/matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.0.tar.gz
+/matplotlib-3.0.0-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.1.tar.gz
+/matplotlib-3.0.1-with-freetype-2.9.1.tar.gz
+/matplotlib-3.0.2.tar.gz
+/matplotlib-3.0.3.tar.gz

0001-Force-using-system-qhull.patch

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

0001-Use-packaged-jquery-and-jquery-ui.patch

@@ -0,0 +1,113 @@
+From fede0d8731c1301720f16e2d46df8275e8ecf9e8 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                                      | 46 -------------------
+ 3 files changed, 6 insertions(+), 52 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 94c8106d3..42ae7e294 100644
+--- a/setup.py
++++ b/setup.py
+@@ -28,8 +28,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.
+@@ -121,50 +119,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.
+-class sdist_with_jquery(cmdclass['sdist']):
+-    def make_release_tree(self, base_dir, files):
+-        super(sdist_with_jquery, self).make_release_tree(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):
+-        super(install_lib_with_jquery, self).run()
+-        _download_jquery_to(
+-            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
+-
+-
+-class develop_with_jquery(DevelopCommand):
+-    def run(self):
+-        super(develop_with_jquery, self).run()
+-        _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
+

0001-matplotlibrc-path-search-fix.patch

@@ -0,0 +1,101 @@
+From eeeee74ff61646d321500490bbb9dbbcde424e14 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
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ lib/matplotlib/__init__.py            | 18 +++---------------
+ lib/matplotlib/tests/test_rcparams.py | 22 ++++++++++++++++------
+ 2 files changed, 19 insertions(+), 21 deletions(-)
+
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index 091cb6178..5648392ce 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -664,18 +664,7 @@ def _get_data_path():
+         return path
+ 
+     def get_candidate_paths():
+-        yield Path(__file__).with_name('mpl-data')
+-        # setuptools' namespace_packages may highjack 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'
++        yield Path('/usr/share/matplotlib/mpl-data')
+ 
+     for path in get_candidate_paths():
+         if path.is_dir():
+@@ -727,8 +716,7 @@ def matplotlib_fname():
+ 
+          - `$HOME/.matplotlib/matplotlibrc` if `$HOME` is defined.
+ 
+-    - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
+-      system-defined copy.
++    - Lastly, it looks in `/etc/matplotlibrc` for a system-defined copy.
+     """
+ 
+     def gen_candidates():
+@@ -741,7 +729,7 @@ def matplotlib_fname():
+             yield matplotlibrc
+             yield os.path.join(matplotlibrc, 'matplotlibrc')
+         yield os.path.join(get_configdir(), 'matplotlibrc')
+-        yield os.path.join(get_data_path(), 'matplotlibrc')
++        yield '/etc/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 7eec4d421..4c74619f6 100644
+--- a/lib/matplotlib/tests/test_rcparams.py
++++ b/lib/matplotlib/tests/test_rcparams.py
+@@ -451,11 +451,22 @@ 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.
+     deprecated = {*mpl._all_deprecated, *mpl._deprecated_remain_as_none}
+-    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():
+@@ -478,11 +489,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
+

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

@@ -0,0 +1,40 @@
+From 64c0ea2ea7986d6cb05b41d37226f510ffe41b76 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   | 2 +-
+ lib/mpl_toolkits/tests/test_axes_grid1.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
+index 17c0d1967..e261513df 100644
+--- a/lib/matplotlib/tests/test_streamplot.py
++++ b/lib/matplotlib/tests/test_streamplot.py
+@@ -61,7 +61,7 @@ def test_linewidth():
+ 
+ 
+ @image_comparison(baseline_images=['streamplot_masks_and_nans'],
+-                  tol=0.04 if on_win else 0,
++                  tol=0.04 if on_win else 0.01,
+                   remove_text=True, style='mpl20')
+ def test_masks_and_nans():
+     X, Y, U, V = velocity_field()
+diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
+index ddbf7e9f7..86e49cc45 100644
+--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
++++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
+@@ -361,7 +361,7 @@ def test_zooming_with_inverted_axes():
+ 
+ 
+ @image_comparison(baseline_images=['anchored_direction_arrows'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.02,
+                   extensions=['png'])
+ def test_anchored_direction_arrows():
+     fig, ax = plt.subplots()
+-- 
+2.20.1
+

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

@@ -0,0 +1,658 @@
+From 4b3c9145a4c247197a40c5314151566e437f7bbe 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             | 49 ++++++++++---------
+ 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          |  8 +--
+ lib/matplotlib/tests/test_cycles.py           |  3 --
+ lib/matplotlib/tests/test_figure.py           |  3 +-
+ lib/matplotlib/tests/test_image.py            |  2 +-
+ lib/matplotlib/tests/test_legend.py           |  5 +-
+ 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       |  2 +-
+ lib/matplotlib/tests/test_transforms.py       |  2 +-
+ lib/matplotlib/tests/test_units.py            |  1 -
+ .../tests/test_axisartist_floating_axes.py    |  4 +-
+ ...test_axisartist_grid_helper_curvelinear.py |  6 +--
+ lib/mpl_toolkits/tests/test_mplot3d.py        |  4 +-
+ 22 files changed, 59 insertions(+), 63 deletions(-)
+
+diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
+index 85b8d5e87..f3fc47c68 100644
+--- a/lib/matplotlib/testing/decorators.py
++++ b/lib/matplotlib/testing/decorators.py
+@@ -338,7 +338,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 283db9abe..2ae11142c 100644
+--- a/lib/matplotlib/tests/test_artist.py
++++ b/lib/matplotlib/tests/test_artist.py
+@@ -94,7 +94,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 c0e0e560d..6e88c167c 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -554,7 +554,7 @@ def test_single_point():
+ 
+ 
+ @image_comparison(baseline_images=['single_date'], extensions=['png'],
+-        style='mpl20')
++        style='mpl20', tol=1.97)
+ def test_single_date():
+     time1 = [721964.0]
+     data1 = [-65.54]
+@@ -1028,7 +1028,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])
+@@ -1110,7 +1110,8 @@ def test_pcolormesh():
+ 
+ 
+ @image_comparison(baseline_images=['pcolormesh_datetime_axis'],
+-                  extensions=['png'], remove_text=False, style='mpl20')
++                  extensions=['png'], remove_text=False, style='mpl20',
++                  tol=0.19)
+ def test_pcolormesh_datetime_axis():
+     fig = plt.figure()
+     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
+@@ -1136,7 +1137,8 @@ def test_pcolormesh_datetime_axis():
+ 
+ 
+ @image_comparison(baseline_images=['pcolor_datetime_axis'],
+-                  extensions=['png'], remove_text=False, style='mpl20')
++                  extensions=['png'], remove_text=False, style='mpl20',
++                  tol=0.19)
+ def test_pcolor_datetime_axis():
+     fig = plt.figure()
+     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
+@@ -1193,7 +1195,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
+@@ -2540,7 +2542,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)
+@@ -2558,7 +2560,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))
+@@ -2569,7 +2571,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))
+@@ -2580,7 +2582,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))
+@@ -2591,7 +2593,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))
+@@ -2602,7 +2604,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))
+@@ -2613,7 +2615,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))
+@@ -2624,7 +2626,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))
+@@ -2635,7 +2637,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))
+@@ -2646,7 +2648,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))
+@@ -2657,7 +2659,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))
+@@ -2668,7 +2670,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))
+@@ -2679,7 +2681,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))
+@@ -2690,7 +2692,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))
+@@ -3369,8 +3371,7 @@ def test_vertex_markers():
+ 
+ 
+ @image_comparison(baseline_images=['vline_hline_zorder',
+-                                   'errorbar_zorder'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                                   'errorbar_zorder'])
+ def test_eb_line_zorder():
+     x = list(range(10))
+ 
+@@ -4050,7 +4051,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
+@@ -4943,7 +4944,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 = {
+@@ -5462,7 +5463,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
+     UTC = datetime.timezone.utc
+diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
+index 6812ee1ad..5e5f19aac 100644
+--- a/lib/matplotlib/tests/test_collections.py
++++ b/lib/matplotlib/tests/test_collections.py
+@@ -466,7 +466,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 1c358c09a..21019be34 100644
+--- a/lib/matplotlib/tests/test_colorbar.py
++++ b/lib/matplotlib/tests/test_colorbar.py
+@@ -94,7 +94,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.
+@@ -104,7 +104,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.
+@@ -118,7 +118,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]
+@@ -172,7 +172,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)
+@@ -231,7 +231,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 de8161ea7..a1f307abe 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -246,7 +246,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 c1f27b9ef..149afadb9 100644
+--- a/lib/matplotlib/tests/test_contour.py
++++ b/lib/matplotlib/tests/test_contour.py
+@@ -227,7 +227,8 @@ def test_given_colors_levels_and_extends():
+ 
+ 
+ @image_comparison(baseline_images=['contour_datetime_axis'],
+-                  extensions=['png'], remove_text=False, style='mpl20')
++                  extensions=['png'], remove_text=False, style='mpl20',
++                  tol=0.18)
+ def test_contour_datetime_axis():
+     fig = plt.figure()
+     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
+@@ -253,7 +254,8 @@ def test_contour_datetime_axis():
+ 
+ 
+ @image_comparison(baseline_images=['contour_test_label_transforms'],
+-                  extensions=['png'], remove_text=True, style='mpl20')
++                  extensions=['png'], remove_text=True, style='mpl20',
++                  tol=1.38)
+ def test_labels():
+     # Adapted from pylab_examples example code: contour_demo.py
+     # see issues #2475, #2843, and #2818 for explanation
+@@ -284,7 +286,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_cycles.py b/lib/matplotlib/tests/test_cycles.py
+index 8184d3eee..5a067f8e0 100644
+--- a/lib/matplotlib/tests/test_cycles.py
++++ b/lib/matplotlib/tests/test_cycles.py
+@@ -10,7 +10,6 @@ from cycler import cycler
+ 
+ 
+ @image_comparison(baseline_images=['color_cycle_basic'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
+                   extensions=['png'])
+ def test_colorcycle_basic():
+     fig, ax = plt.subplots()
+@@ -28,7 +27,6 @@ def test_colorcycle_basic():
+ 
+ 
+ @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
+                   remove_text=True, extensions=['png'])
+ def test_marker_cycle():
+     fig, ax = plt.subplots()
+@@ -62,7 +60,6 @@ def test_marker_cycle():
+ 
+ 
+ @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
+                   extensions=['png'])
+ def test_linestylecycle_basic():
+     fig, ax = plt.subplots()
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index 4c688eb05..826b44869 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -13,8 +13,7 @@ import numpy as np
+ import pytest
+ 
+ 
+-@image_comparison(baseline_images=['figure_align_labels'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(baseline_images=['figure_align_labels'])
+ 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 c0ffc061a..ace55c2f5 100644
+--- a/lib/matplotlib/tests/test_image.py
++++ b/lib/matplotlib/tests/test_image.py
+@@ -766,7 +766,7 @@ def test_imshow_endianess():
+ 
+ 
+ @image_comparison(baseline_images=['imshow_masked_interpolation'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.25,
+                   remove_text=True, style='mpl20')
+ def test_imshow_masked_interpolation():
+ 
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index d508d6f41..69286069d 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -108,7 +108,6 @@ def test_multiple_keys():
+ 
+ 
+ @image_comparison(baseline_images=['rgba_alpha'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
+                   extensions=['png'], remove_text=True)
+ def test_alpha_rgba():
+     import matplotlib.pyplot as plt
+@@ -120,7 +119,6 @@ def test_alpha_rgba():
+ 
+ 
+ @image_comparison(baseline_images=['rcparam_alpha'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
+                   extensions=['png'], remove_text=True)
+ def test_alpha_rcparam():
+     import matplotlib.pyplot as plt
+@@ -148,8 +146,7 @@ def test_fancy():
+                ncol=2, shadow=True, title="My legend", numpoints=1)
+ 
+ 
+-@image_comparison(baseline_images=['framealpha'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(baseline_images=['framealpha'], remove_text=True)
+ def test_framealpha():
+     x = np.linspace(1, 100, 100)
+     y = x
+diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
+index a05c8b3c8..b6f11281f 100644
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -169,7 +169,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))
+@@ -183,7 +183,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 89a77e258..2e5c16f75 100644
+--- a/lib/matplotlib/tests/test_patches.py
++++ b/lib/matplotlib/tests/test_patches.py
+@@ -260,9 +260,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 6e80d8d98..0f158eb9e 100644
+--- a/lib/matplotlib/tests/test_patheffects.py
++++ b/lib/matplotlib/tests/test_patheffects.py
+@@ -119,7 +119,7 @@ def test_SimplePatchShadow_offset():
+     assert pe._offset == (4, 5)
+ 
+ 
+-@image_comparison(baseline_images=['collection'], tol=0.02, style='mpl20')
++@image_comparison(baseline_images=['collection'], tol=0.084, style='mpl20')
+ 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 9cb806c6f..c0ccf5f8c 100644
+--- a/lib/matplotlib/tests/test_pickle.py
++++ b/lib/matplotlib/tests/test_pickle.py
+@@ -44,7 +44,7 @@ def test_simple():
+ 
+ @image_comparison(baseline_images=['multi_pickle'],
+                   extensions=['png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.11,
+                   style='mpl20')
+ 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 4470e02fa..70aa1e718 100644
+--- a/lib/matplotlib/tests/test_quiver.py
++++ b/lib/matplotlib/tests/test_quiver.py
+@@ -130,7 +130,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 e261513df..907841494 100644
+--- a/lib/matplotlib/tests/test_streamplot.py
++++ b/lib/matplotlib/tests/test_streamplot.py
+@@ -40,7 +40,7 @@ def test_startpoints():
+ 
+ 
+ @image_comparison(baseline_images=['streamplot_colormap'],
+-                  tol=.04, remove_text=True, style='mpl20')
++                  remove_text=True, style='mpl20')
+ 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 6275d5b54..a5c03f0a3 100644
+--- a/lib/matplotlib/tests/test_transforms.py
++++ b/lib/matplotlib/tests/test_transforms.py
+@@ -70,7 +70,7 @@ def test_external_transform_api():
+ 
+ 
+ @image_comparison(baseline_images=['pre_transform_data'],
+-                  tol=0.08, remove_text=True, style='mpl20')
++                  tol=0.155, remove_text=True, style='mpl20')
+ 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/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index fec498af3..fe8f3f383 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -75,7 +75,6 @@ def quantity_converter():
+ # 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'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
+                   extensions=['png'], remove_text=False, style='mpl20')
+ def test_numpy_facade(quantity_converter):
+     # Register the class
+diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
+index 929c0368a..e6e5ca1ff 100644
+--- a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
++++ b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
+@@ -21,7 +21,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()
+@@ -77,7 +77,7 @@ def test_curvelinear3():
+ 
+ 
+ @image_comparison(baseline_images=['curvelinear4'],
+-                  extensions=['png'], style='default', tol=0.015)
++                  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 32e1c884d..2b38866c5 100644
+--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
++++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+@@ -17,7 +17,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
+@@ -85,7 +85,7 @@ def test_custom_transform():
+ 
+ 
+ @image_comparison(baseline_images=['polar_box'],
+-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03),
++                  tol=0.08,
+                   extensions=['png'], style='default')
+ def test_polar_box():
+     fig = plt.figure(figsize=(5, 5))
+@@ -147,7 +147,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 bc9c43ec7..48727de52 100644
+--- a/lib/mpl_toolkits/tests/test_mplot3d.py
++++ b/lib/mpl_toolkits/tests/test_mplot3d.py
+@@ -254,7 +254,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
+@@ -733,7 +733,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
+

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

@@ -0,0 +1,289 @@
+From 179885bd9a442bc171e562a8997abde2824997fa 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                           | 6 +++---
+ 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        | 4 ++--
+ 14 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index f678fbed3..bac0cb802 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -69,7 +69,7 @@ def __prepare_fancyarrow_dpi_cor_test():
+ 
+ @image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'],
+                   remove_text=True, extensions=['png'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.016,
+                   savefig_kwarg=dict(dpi=100))
+ def test_fancyarrow_dpi_cor_100dpi():
+     """
+@@ -85,7 +85,7 @@ def test_fancyarrow_dpi_cor_100dpi():
+ 
+ @image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'],
+                   remove_text=True, extensions=['png'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  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 c0e0e560d..0021bbda4 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -387,7 +387,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
+@@ -3370,7 +3370,7 @@ def test_vertex_markers():
+ 
+ @image_comparison(baseline_images=['vline_hline_zorder',
+                                    'errorbar_zorder'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
+ def test_eb_line_zorder():
+     x = list(range(10))
+ 
+@@ -5142,7 +5142,7 @@ def test_title_location_roundtrip():
+ 
+ @image_comparison(baseline_images=["loglog"], remove_text=True,
+                   extensions=['png'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  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 00cbf5db9..33e6fb21a 100644
+--- a/lib/matplotlib/tests/test_backends_interactive.py
++++ b/lib/matplotlib/tests/test_backends_interactive.py
+@@ -105,7 +105,7 @@ fig.canvas.mpl_connect("draw_event", lambda event: timer.start())
+ 
+ plt.show()
+ """
+-_test_timeout = 10  # Empirically, 1s is not enough on Travis.
++_test_timeout = 30  # Empirically, 1s is not enough on Travis.
+ 
+ 
+ @pytest.mark.parametrize("backend", _get_testable_interactive_backends())
+diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
+index 6812ee1ad..582aabb5c 100644
+--- a/lib/matplotlib/tests/test_collections.py
++++ b/lib/matplotlib/tests/test_collections.py
+@@ -442,7 +442,7 @@ def test_barb_limits():
+ 
+ @image_comparison(baseline_images=['EllipseCollection_test_image'],
+                   extensions=['png'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  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 de8161ea7..2af2d6a42 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -173,7 +173,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 8184d3eee..73b0f216d 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,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.008,
+                   extensions=['png'])
+ def test_colorcycle_basic():
+     fig, ax = plt.subplots()
+@@ -28,7 +28,7 @@ def test_colorcycle_basic():
+ 
+ 
+ @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.008,
+                   remove_text=True, extensions=['png'])
+ def test_marker_cycle():
+     fig, ax = plt.subplots()
+@@ -62,7 +62,7 @@ def test_marker_cycle():
+ 
+ 
+ @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.009,
+                   extensions=['png'])
+ def test_linestylecycle_basic():
+     fig, ax = plt.subplots()
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index 4c688eb05..63f562770 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -14,7 +14,7 @@ import pytest
+ 
+ 
+ @image_comparison(baseline_images=['figure_align_labels'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  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 c0ffc061a..ca15df113 100644
+--- a/lib/matplotlib/tests/test_image.py
++++ b/lib/matplotlib/tests/test_image.py
+@@ -766,7 +766,7 @@ def test_imshow_endianess():
+ 
+ 
+ @image_comparison(baseline_images=['imshow_masked_interpolation'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.006,
+                   remove_text=True, style='mpl20')
+ def test_imshow_masked_interpolation():
+ 
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index d508d6f41..9147ef336 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -108,7 +108,7 @@ def test_multiple_keys():
+ 
+ 
+ @image_comparison(baseline_images=['rgba_alpha'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.007,
+                   extensions=['png'], remove_text=True)
+ def test_alpha_rgba():
+     import matplotlib.pyplot as plt
+@@ -120,7 +120,7 @@ def test_alpha_rgba():
+ 
+ 
+ @image_comparison(baseline_images=['rcparam_alpha'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.007,
+                   extensions=['png'], remove_text=True)
+ def test_alpha_rcparam():
+     import matplotlib.pyplot as plt
+@@ -149,7 +149,7 @@ def test_fancy():
+ 
+ 
+ @image_comparison(baseline_images=['framealpha'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  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 9cb806c6f..91774abfd 100644
+--- a/lib/matplotlib/tests/test_pickle.py
++++ b/lib/matplotlib/tests/test_pickle.py
+@@ -44,7 +44,7 @@ def test_simple():
+ 
+ @image_comparison(baseline_images=['multi_pickle'],
+                   extensions=['png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.004,
+                   style='mpl20')
+ 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 ebe5c4de9..2999b624d 100644
+--- a/lib/matplotlib/tests/test_scale.py
++++ b/lib/matplotlib/tests/test_scale.py
+@@ -99,7 +99,7 @@ def test_logscale_transform_repr():
+ 
+ 
+ @image_comparison(baseline_images=['logscale_nonpos_values'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.008,
+                   extensions=['png'], style='mpl20')
+ def test_logscale_nonpos_values():
+     np.random.seed(19680801)
+diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
+index e261513df..c8c8faf99 100644
+--- a/lib/matplotlib/tests/test_streamplot.py
++++ b/lib/matplotlib/tests/test_streamplot.py
+@@ -49,7 +49,7 @@ def test_colormap():
+ 
+ 
+ @image_comparison(baseline_images=['streamplot_linewidth'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.002,
+                   remove_text=True, style='mpl20')
+ def test_linewidth():
+     X, Y, U, V = velocity_field()
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index fec498af3..12a8d8a3e 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -75,7 +75,7 @@ def quantity_converter():
+ # 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'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  tol=0.003,
+                   extensions=['png'], remove_text=False, style='mpl20')
+ def test_numpy_facade(quantity_converter):
+     # Register the class
+@@ -100,7 +100,7 @@ def test_numpy_facade(quantity_converter):
+ 
+ # Tests gh-8908
+ @image_comparison(baseline_images=['plot_masked_units'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
++                  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 32e1c884d..741d197b5 100644
+--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
++++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+@@ -17,7 +17,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.04)
+ def test_custom_transform():
+     class MyTransform(Transform):
+         input_dims = 2
+@@ -85,7 +85,7 @@ def test_custom_transform():
+ 
+ 
+ @image_comparison(baseline_images=['polar_box'],
+-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03),
++                  tol=0.04,
+                   extensions=['png'], style='default')
+ def test_polar_box():
+     fig = plt.figure(figsize=(5, 5))
+-- 
+2.20.1
+

generate-tarball.sh

@@ -1,19 +0,0 @@
-#! /bin/sh
-
-version=$1
-
-[ -z $version ] && exit 1
-
-dir=matplotlib-${version}
-file=matplotlib-${version}.tar.gz
-result=matplotlib-${version}-without-gpc.tar.gz
-
-wget -vc http://downloads.sourceforge.net/matplotlib/$file
-
-rm -rf matplotlib-${version}
-tar xzf $file
-
-rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
-
-rm -f $result
-tar czf $result $dir

python-matplotlib-fontconfig.patch

@@ -1,64 +0,0 @@
-diff -ur matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py matplotlib-1.2.0/lib/matplotlib/font_manager.py
---- matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py	2012-10-31 01:11:14.000000000 +0100
-+++ matplotlib-1.2.0/lib/matplotlib/font_manager.py	2013-04-03 01:50:34.433802284 +0200
-@@ -62,7 +62,7 @@
- except ImportError:
-     import pickle
- 
--USE_FONTCONFIG = False
-+USE_FONTCONFIG = True
- 
- verbose = matplotlib.verbose
- 
-@@ -771,7 +771,7 @@
-                 return float(self._size)
-             except ValueError:
-                 pass
--        default_size = fontManager.get_default_size()
-+        default_size = FontManager.get_default_size()
-         return default_size * font_scalings.get(self._size)
- 
-     def get_file(self):
-@@ -991,7 +991,10 @@
-         self.afmfiles = findSystemFonts(paths, fontext='afm') + \
-             findSystemFonts(fontext='afm')
-         self.afmlist = createFontList(self.afmfiles, fontext='afm')
--        self.defaultFont['afm'] = self.afmfiles[0]
-+        try:
-+            self.defaultFont['afm'] = self.afmfiles[0]
-+        except IndexError:
-+            self.defaultFont['afm'] = None
- 
-         self.ttf_lookup_cache = {}
-         self.afm_lookup_cache = {}
-@@ -1002,7 +1005,8 @@
-         """
-         return self.__default_weight
- 
--    def get_default_size(self):
-+    @staticmethod
-+    def get_default_size():
-         """
-         Return the default font size.
-         """
-@@ -1276,7 +1280,7 @@
-         except OSError:
-             return None
-         if pipe.returncode == 0:
--            for match in _fc_match_regex.finditer(output):
-+            for match in _fc_match_regex.finditer(output.decode("utf-8")):
-                 file = match.group(1)
-                 if os.path.splitext(file)[1][1:] in fontexts:
-                     return file
-diff -ur matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc
---- matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc	2012-11-08 17:39:20.000000000 +0100
-+++ matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc	2013-04-03 01:50:03.693755542 +0200
-@@ -198,7 +198,7 @@
- #mathtext.it  : serif:italic
- #mathtext.bf  : serif:bold
- #mathtext.sf  : sans
--#mathtext.fontset : cm # Should be 'cm' (Computer Modern), 'stix',
-+mathtext.fontset : stix # Should be 'cm' (Computer Modern), 'stix',
-                        # 'stixsans' or 'custom'
- #mathtext.fallback_to_cm : True  # When True, use symbols from the Computer Modern
-                                  # fonts when a symbol can not be found in one of

python-matplotlib-noagg.patch

@@ -1,73 +0,0 @@
-diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
---- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:49:21.295712608 -0200
-+++ matplotlib-1.2.0/setupext.py	2012-11-23 14:49:31.508712999 -0200
-@@ -96,7 +96,6 @@ BUILT_GDK       = False
- BUILT_PATH      = False
- BUILT_TRI       = False
- 
--AGG_VERSION = 'agg24'
- TCL_TK_CACHE = None
- 
- # for nonstandard installation/build with --prefix variable
-@@ -621,7 +620,8 @@ def add_agg_flags(module):
-     # before adding the freetype flags since -z comes later
-     add_base_flags(module)
-     add_numpy_flags(module)
--    module.include_dirs.extend(['src', '%s/include'%AGG_VERSION, '.'])
-+    module.include_dirs.extend(['src', '/usr/include/agg2', '.'])
-+    module.libraries.append('agg')
- 
-     # put these later for correct link order
-     module.libraries.extend(std_libs)
-@@ -1220,17 +1220,7 @@ def build_agg(ext_modules, packages):
-     global BUILT_AGG
-     if BUILT_AGG: return # only build it if you you haven't already
- 
--    agg = (
--           'agg_trans_affine.cpp',
--           'agg_bezier_arc.cpp',
--           'agg_curves.cpp',
--           'agg_vcgen_dash.cpp',
--           'agg_vcgen_stroke.cpp',
--           'agg_image_filters.cpp',
--           )
--
--    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
--    deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
-+    deps = ['src/mplutils.cpp', 'src/agg_py_transforms.cpp']
-     deps.extend(glob.glob('CXX/*.cxx'))
-     deps.extend(glob.glob('CXX/*.c'))
-     temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
-@@ -1253,16 +1243,7 @@ def build_path(ext_modules, packages):
-     global BUILT_PATH
-     if BUILT_PATH: return # only build it if you you haven't already
- 
--    agg = (
--           'agg_vcgen_contour.cpp',
--           'agg_curves.cpp',
--           'agg_bezier_arc.cpp',
--           'agg_trans_affine.cpp',
--           'agg_vcgen_stroke.cpp',
--           )
--
--    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
--    deps.extend(glob.glob('CXX/*.cxx'))
-+    deps = glob.glob('CXX/*.cxx')
-     deps.extend(glob.glob('CXX/*.c'))
- 
-     temp_copy('src/_path.cpp', 'src/path.cpp')
-@@ -1287,14 +1268,8 @@ def build_image(ext_modules, packages):
-     global BUILT_IMAGE
-     if BUILT_IMAGE: return # only build it if you you haven't already
- 
--    agg = ('agg_trans_affine.cpp',
--           'agg_image_filters.cpp',
--           'agg_bezier_arc.cpp',
--           )
--
-     temp_copy('src/_image.cpp', 'src/image.cpp')
-     deps = ['src/image.cpp', 'src/mplutils.cpp']
--    deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
-     deps.extend(glob.glob('CXX/*.cxx'))
-     deps.extend(glob.glob('CXX/*.c'))
- 

python-matplotlib-tk.patch

@@ -1,35 +0,0 @@
-diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
---- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:50:48.954715965 -0200
-+++ matplotlib-1.2.0/setupext.py	2012-11-23 14:55:53.731727636 -0200
-@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
- 
-     tcl_poss = [tcl_lib_dir,
-                 os.path.normpath(os.path.join(tcl_lib_dir, '..')),
--                "/usr/lib/tcl"+str(Tkinter.TclVersion),
--                "/usr/lib"]
-+                "@@libdir@@/tcl"+str(Tkinter.TclVersion),
-+                "@@libdir@@"]
-     tk_poss = [tk_lib_dir,
-                 os.path.normpath(os.path.join(tk_lib_dir, '..')),
--               "/usr/lib/tk"+str(Tkinter.TkVersion),
--               "/usr/lib"]
-+               "@@libdir@@/tk"+str(Tkinter.TkVersion),
-+               "@@libdir@@"]
-     for ptcl, ptk in zip(tcl_poss, tk_poss):
-         tcl_config = os.path.join(ptcl, "tclConfig.sh")
-         tk_config = os.path.join(ptk, "tkConfig.sh")
-@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
-     return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
- 
- def hardcoded_tcl_config():
--    tcl_inc = "/usr/local/include"
--    tk_inc = "/usr/local/include"
--    tcl_lib = "/usr/local/lib"
--    tk_lib = "/usr/local/lib"
-+    tcl_inc = "/usr/include"
-+    tk_inc = "/usr/include"
-+    tcl_lib = "@@libdir@@"
-+    tk_lib = "@@libdir@@"
-     return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
- 
- def add_tk_flags(module):

python-matplotlib.spec

@@ -1,66 +1,86 @@
-%if 0%{?fedora} >= 18
-%global with_python3            1
-%global basepy3dir              %(echo ../`basename %{py3dir}`)
-%else
-%global with_python3            0
-%endif
-%global __provides_exclude_from	.*/site-packages/.*\\.so$
-%global with_html               1
+%global with_html               0
 
-# On RHEL 7 onwards, don't build with wx:
-%if 0%{?rhel} >= 7
-%global with_wx 0
+# It seems like there's some kind of weird occasional error where a
+# build (often aarch64 or ppc64) will fail in one of the Stix font
+# tests with a huge RMS difference, but if you run the same build again,
+# you won't get the same error. Unless someone can figure out what's
+# going on, we just have to keep re-running the build until it doesn't
+# happen.
+%global run_tests               1
+
+# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
+# WXAgg Agg Cairo PS PDF SVG
+%global backend                 TkAgg
+
+%if "%{backend}" == "TkAgg"
+%global backend_subpackage tk
 %else
-%global with_wx 1
+%  if "%{backend}" == "Qt4Agg"
+%global backend_subpackage qt4
+%  else
+%    if "%{backend}" == "Qt5Agg"
+%global backend_subpackage qt5
+%    else
+%      if "%{backend}" == "WXAgg"
+%global backend_subpackage wx
+%      endif
+%    endif
+%  endif
 %endif
 
+# https://fedorahosted.org/fpc/ticket/381
+%global with_bundled_fonts      1
+
+# Use the same directory of the main package for subpackage licence and docs
+%global _docdir_fmt %{name}
+
+#global rctag rc1
+
+# Updated test images for new FreeType.
+%global mpl_images_version 3.0.1
+
+# The version of FreeType in this Fedora branch.
+%global ftver 2.9.1
 
 Name:           python-matplotlib
-Version:        1.2.0
-Release:        14%{?dist}
+Version:        3.0.3
+Release:        2%{?rctag:.%{rctag}}%{?dist}
 Summary:        Python 2D plotting library
-Group:          Development/Libraries
-License:        Python
+# qt4_editor backend is MIT
+License:        Python and MIT
 URL:            http://matplotlib.org
-#Modified Sources to remove the one undistributable file
-#See generate-tarball.sh in fedora cvs repository for logic
-#sha1sum matplotlib-1.2.0-without-gpc.tar.gz
-#92ada4ef4e7374d67e46e30bfb08c3fed068d680  matplotlib-1.2.0-without-gpc.tar.gz
-Source0:        matplotlib-%{version}-without-gpc.tar.gz
+Source0:        https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}/matplotlib-%{version}%{?rctag}.tar.gz
+Source1:        setup.cfg
 
-Patch0:         %{name}-noagg.patch
-Patch1:         %{name}-tk.patch
-# http://sourceforge.net/mailarchive/message.php?msg_id=30202451
-# https://github.com/matplotlib/matplotlib/pull/1666
-# https://bugzilla.redhat.com/show_bug.cgi?id=896182
-Patch2:         %{name}-fontconfig.patch
+# Because the qhull package stopped shipping pkgconfig files.
+# https://src.fedoraproject.org/rpms/qhull/pull-request/1
+Patch0001:      0001-Force-using-system-qhull.patch
 
-BuildRequires:  agg-devel
+# 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/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:
+Patch1002:      0002-Increase-tolerances-for-non-x86_64-arches.patch
+# Image tolerances for 32-bit systems: i686 armv7hl
+Patch1003:      0003-Increase-some-tolerances-for-32-bit-systems.patch
+# Image tolerances for 64-bit (but not x86_64) systems: aarch64 ppc64(le) s390x
+Patch1004:      0003-Increase-some-tolerances-for-non-x86-arches.patch
+
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  freetype-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  libpng-devel
-BuildRequires:  numpy
-BuildRequires:  pycairo-devel
-BuildRequires:  pygtk2-devel
-BuildRequires:  pyparsing
-BuildRequires:  python-dateutil
-BuildRequires:  python2-devel
-BuildRequires:  pytz
+BuildRequires:  qhull-devel
+BuildRequires:  texlive-cm
 BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  zlib-devel
-Requires:       dejavu-sans-fonts
-Requires:       dvipng
-Requires:       numpy
-Requires:       pycairo
-Requires:       pygtk2
-Requires:       pyparsing
-Requires:       python-dateutil
-Requires:       pytz
-%if 0%{?fedora} >= 18
-Requires:	stix-math-fonts
-%else
-Requires:	stix-fonts
-%endif
 
 %description
 Matplotlib is a python 2D plotting library which produces publication
@@ -73,75 +93,68 @@ 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        qt4
-Summary:        Qt4 backend for python-matplotlib
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-BuildRequires:  PyQt4-devel
-Requires:       PyQt4
+%package -n python3-matplotlib-data
+Summary:        Data used by python-matplotlib
+BuildArch:      noarch
+%if %{with_bundled_fonts}
+Requires:       python3-matplotlib-data-fonts = %{version}-%{release}
+%endif
+Obsoletes:      python-matplotlib-data < 3
+%{?python_provide:%python_provide python3-matplotlib-data}
 
-%description    qt4
+%description -n python3-matplotlib-data
 %{summary}
 
-%package        tk
-Summary:        Tk backend for python-matplotlib
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-BuildRequires:  tcl-devel
-BuildRequires:  tkinter
-BuildRequires:  tk-devel
-Requires:       tkinter
+%if %{with_bundled_fonts}
+%package -n python3-matplotlib-data-fonts
+Summary:        Fonts used by python-matplotlib
+# STIX and Computer Modern is OFL
+# DejaVu is Bitstream Vera and Public Domain
+License:        OFL and Bitstream Vera and Public Domain
+BuildArch:      noarch
+Requires:       python3-matplotlib-data = %{version}-%{release}
+Obsoletes:      python-matplotlib-data-fonts < 3
+%{?python_provide:%python_provide python3-matplotlib-data-fonts}
 
-%description    tk
+%description -n python3-matplotlib-data-fonts
 %{summary}
-
-%if %{with_wx}
-%package        wx
-Summary:        wxPython backend for python-matplotlib
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-BuildRequires:  wxPython-devel
-Requires:       wxPython
-
-%description    wx
-%{summary}
-%endif # with_wx
-
-%package        doc
-Summary:        Documentation files for python-matplotlib
-Group:          Documentation
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-%if %{with_html}
-BuildRequires:  python-sphinx
-BuildRequires:  tex(latex)
-BuildRequires:  dvipng
 %endif
 
-%description    doc
-%{summary}
-
-%if %{with_python3}
 %package -n     python3-matplotlib
 Summary:        Python 2D plotting library
-Group:          Development/Libraries
 BuildRequires:  python3-cairo
+BuildRequires:  python3-cycler >= 0.10.0
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  python3-gobject
+BuildRequires:  python3-kiwisolver
 BuildRequires:  python3-numpy
+BuildRequires:  python3-pillow
 BuildRequires:  python3-pyparsing
 BuildRequires:  python3-pytz
-BuildRequires:  python3-six
-Requires:       python3-numpy
+BuildRequires:  python3-sphinx
+Requires:       dejavu-sans-fonts
+Requires:       dvipng
+Requires:       python3-matplotlib-data = %{version}-%{release}
 Requires:       python3-cairo
-Requires:       python3-pyparsing
+Requires:       python3-cycler >= 0.10.0
 Requires:       python3-dateutil
-Requires:       python3-pytz
-%if 0%{?fedora} >= 18
-Requires:	stix-math-fonts
-%else
-Requires:	stix-fonts
+Requires:       python3-kiwisolver
+Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
+%if %{run_tests}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-xdist
 %endif
+Requires:       python3-numpy
+Recommends:     python3-pillow
+Requires:       python3-pyparsing
+%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
@@ -156,169 +169,525 @@ errorcharts, scatterplots, etc, with just a few lines of code.
 
 %package -n     python3-matplotlib-qt4
 Summary:        Qt4 backend for python3-matplotlib
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
 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}
 
+%package -n     python3-matplotlib-qt5
+Summary:        Qt5 backend for python3-matplotlib
+BuildRequires:  python3-qt5
+Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
+Requires:       python3-qt5
+%{?python_provide:%python_provide python3-matplotlib-qt5}
+
+%description -n python3-matplotlib-qt5
+%{summary}
+
+%package -n     python3-matplotlib-gtk3
+Summary:        GTK3 backend for python3-matplotlib
+# This should be converted to typelib(Gtk) when supported
+BuildRequires:  gtk3
+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}
+
 %package -n     python3-matplotlib-tk
 Summary:        Tk backend for python3-matplotlib
-Group:          Development/Libraries
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 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
+%{?python_provide:%python_provide python3-matplotlib-wx}
+
+%description -n python3-matplotlib-wx
+%{summary}
+
+%package -n python3-matplotlib-doc
+Summary:        Documentation files for python-matplotlib
+%if %{with_html}
+BuildRequires:  dvipng
+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
-%setup -q -n matplotlib-%{version}
+%autosetup -n matplotlib-%{version}%{?rctag} -N
+%patch0001 -p1
 
-# Remove bundled libraries
-rm -r agg24 lib/matplotlib/pyparsing_py?.py
+%patch0002 -p1
 
-# Remove references to bundled libraries
-%patch0 -p1 -b .noagg
-sed -i -e s/matplotlib\.pyparsing_py./pyparsing/g lib/matplotlib/*.py
+# 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
+%ifarch aarch64 ppc64 ppc64le s390x
+%patch1004 -p1
+%endif
+%ifarch i686 armv7hl
+%patch1003 -p1
+%endif
+rm -r extern/libqhull
 
-# Correct tcl/tk detection
-%patch1 -p1 -b .tk
-sed -i -e 's|@@libdir@@|%{_libdir}|' setupext.py
+# Copy setup.cfg to the builddir
+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
-%patch2 -p1 -b .fontconfig
-
-chmod -x lib/matplotlib/mpl-data/images/*.svg
-
-%if %{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
+sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py
 %endif
 
+
 %build
-xvfb-run %{__python2} setup.py build
+%set_build_flags
+export http_proxy=http://127.0.0.1/
+
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
+  xvfb-run %{__python3} setup.py build
 %if %{with_html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 pushd doc
-    export PYTHONPATH=`realpath ../build/lib.linux*`
-    %{__python2} make.py html
+    MPLCONFIGDIR=$PWD/.. \
+    MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data \
+    PYTHONPATH=`realpath ../build/lib.linux*` \
+        %{__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 '{}' \;
 
-%if %{with_python3}
-pushd %{py3dir}
-    xvfb-run %{__python3} setup.py build
-    # documentation cannot be built with python3 due to syntax errors
-    # and building with python 2 exits with cryptic error messages
-popd
-%endif
-
 %install
-%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
-rm -rf $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/mpl-data/fonts
+export http_proxy=http://127.0.0.1/
 
-%if %{with_python3}
-pushd %{py3dir}
-    %{__python3} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-    chmod +x $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/dates.py
-    rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/mpl-data/fonts
-    rm -f $RPM_BUILD_ROOT%{python3_sitearch}/six.py
-popd
+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
+mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
+mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data/matplotlibrc \
+   %{buildroot}%{_sysconfdir}
+mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \
+   %{buildroot}%{_datadir}/matplotlib
+%if !%{with_bundled_fonts}
+rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
 %endif
 
-%files
-%doc README.txt
-%doc lib/dateutil_py2/LICENSE
-%doc lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
-%doc lib/pytz/LICENSE.txt
-%doc CHANGELOG
-%doc CXX
-%doc INSTALL
-%doc PKG-INFO
-%doc TODO
-%{python_sitearch}/*egg-info
-%{python_sitearch}/matplotlib/
-%{python_sitearch}/mpl_toolkits/
-%{python_sitearch}/pylab.py*
-%exclude %{python_sitearch}/matplotlib/backends/backend_qt4.*
-%exclude %{python_sitearch}/matplotlib/backends/backend_qt4agg.*
-%exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
-%exclude %{python_sitearch}/matplotlib/backends/tkagg.*
-%exclude %{python_sitearch}/matplotlib/backends/_tkagg.so
-%exclude %{python_sitearch}/matplotlib/backends/backend_wx.*
-%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.*
+%if %{run_tests}
+%check
+# These files confuse pytest, and we want to test the installed copy.
+rm -rf build*/
 
-%files qt4
-%{python_sitearch}/matplotlib/backends/backend_qt4.*
-%{python_sitearch}/matplotlib/backends/backend_qt4agg.*
+export http_proxy=http://127.0.0.1/
+# Skips:
+#  * test_invisible_Line_rendering: Checks for "slowness" that often fails on a
+#    heavily-loaded builder.
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
+MATPLOTLIBRC=%{buildroot}%{_sysconfdir}/matplotlibrc \
+PYTHONPATH=%{buildroot}%{python3_sitearch} \
+PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run -a -s "-screen 0 640x480x24" \
+         %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
+             -m 'not network' \
+             -k 'not test_invisible_Line_rendering and not backend_qt5'
+# Run Qt5Agg tests separately to not conflict with Qt4 tests.
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
+MATPLOTLIBRC=%{buildroot}%{_sysconfdir}/matplotlibrc \
+PYTHONPATH=%{buildroot}%{python3_sitearch} \
+PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run -a -s "-screen 0 640x480x24" \
+         %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
+             -m 'not network' \
+             matplotlib.tests.test_backend_qt5
+%endif
 
-%files tk
-%{python_sitearch}/matplotlib/backends/backend_tkagg.py*
-%{python_sitearch}/matplotlib/backends/tkagg.py*
-%{python_sitearch}/matplotlib/backends/_tkagg.so
+%files -n python3-matplotlib-data
+%{_sysconfdir}/matplotlibrc
+%{_datadir}/matplotlib/mpl-data/
+%if %{with_bundled_fonts}
+%exclude %{_datadir}/matplotlib/mpl-data/fonts/
+%endif
 
-%if %{with_wx}
-%files wx
-%{python_sitearch}/matplotlib/backends/backend_wx.*
-%{python_sitearch}/matplotlib/backends/backend_wxagg.*
-%endif # with_wx
+%if %{with_bundled_fonts}
+%files -n python3-matplotlib-data-fonts
+%{_datadir}/matplotlib/mpl-data/fonts/
+%endif
 
-%files doc
+%files -n python3-matplotlib-doc
 %doc examples
 %if %{with_html}
 %doc doc/build/html/*
 %endif
 
-%if %{with_python3}
 %files -n python3-matplotlib
-%doc %{basepy3dir}/README.txt
-%doc %{basepy3dir}/lib/dateutil_py3/LICENSE
-%doc %{basepy3dir}/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
-%doc %{basepy3dir}/lib/pytz/LICENSE.txt
-%doc %{basepy3dir}/CHANGELOG
-%doc %{basepy3dir}/CXX
-%doc %{basepy3dir}/INSTALL
-%doc %{basepy3dir}/PKG-INFO
-%doc %{basepy3dir}/TODO
+%license LICENSE/
+%doc README.rst
 %{python3_sitearch}/*egg-info
+%{python3_sitearch}/matplotlib-*-nspkg.pth
 %{python3_sitearch}/matplotlib/
+%exclude %{python3_sitearch}/matplotlib/tests/baseline_images/*
 %{python3_sitearch}/mpl_toolkits/
+%exclude %{python3_sitearch}/mpl_toolkits/tests/baseline_images/*
 %{python3_sitearch}/pylab.py*
 %{python3_sitearch}/__pycache__/*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4.*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
-%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/backend_qt4*.py
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4*
+#exclude #{python3_sitearch}/matplotlib/backends/backend_qt5*.py
+#exclude #{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5*
+%exclude %{python3_sitearch}/matplotlib/backends/_gtk3_compat.py
+%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_gtk3_compat.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
+%exclude %{python3_sitearch}/matplotlib/backends/_backend_tk.py
+%exclude %{python3_sitearch}/matplotlib/backends/backend_tk*.py
+%exclude %{python3_sitearch}/matplotlib/backends/tkagg.py
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_backend_tk.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_tk*.*
 %exclude %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
 %exclude %{python3_sitearch}/matplotlib/backends/_tkagg.*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_wx*
+%exclude %{python3_sitearch}/matplotlib/backends/wx_compat.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_wx*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/wx_compat.*
+%exclude %{_pkgdocdir}/*/
+
+%files -n python3-matplotlib-test-data
+%{python3_sitearch}/matplotlib/tests/baseline_images/
+%{python3_sitearch}/mpl_toolkits/tests/baseline_images/
 
 %files -n python3-matplotlib-qt4
-%{python3_sitearch}/matplotlib/backends/backend_qt4.*
+%{python3_sitearch}/matplotlib/backends/backend_qt4.py
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
-%{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
+%{python3_sitearch}/matplotlib/backends/backend_qt4agg.py
 %{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.py
+#{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*
+#{python3_sitearch}/matplotlib/backends/backend_qt5agg.py
+#{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*
+
+%files -n python3-matplotlib-gtk3
+%{python3_sitearch}/matplotlib/backends/backend_gtk*.py
+%{python3_sitearch}/matplotlib/backends/_gtk3_compat.py
+%{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
+%{python3_sitearch}/matplotlib/backends/__pycache__/_gtk3_compat.*
+
 %files -n python3-matplotlib-tk
-%{python3_sitearch}/matplotlib/backends/backend_tkagg.py*
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
-%{python3_sitearch}/matplotlib/backends/tkagg.*
+%{python3_sitearch}/matplotlib/backends/backend_tk*.py
+%{python3_sitearch}/matplotlib/backends/_backend_tk.py
+%{python3_sitearch}/matplotlib/backends/tkagg.py
+%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tk*.*
+%{python3_sitearch}/matplotlib/backends/__pycache__/_backend_tk.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
 %{python3_sitearch}/matplotlib/backends/_tkagg.*
-%endif
+
+%files -n python3-matplotlib-wx
+%{python3_sitearch}/matplotlib/backends/backend_wx*.py
+%{python3_sitearch}/matplotlib/backends/wx_compat.py
+%{python3_sitearch}/matplotlib/backends/__pycache__/backend_wx*
+%{python3_sitearch}/matplotlib/backends/__pycache__/wx_compat.*
+
 
 %changelog
+* 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
+
+* Fri Jul 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-4
+- Don't use unversioned Python in build (#1605766)
+- Add missing texlive-cm BR
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.2-3
+- Rebuilt for Python 3.7
+
+* Tue Apr 17 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-2
+- Remove bytecode produced by pytest
+- Add python?-matplotlib-test-data subpackages
+
+* Sat Mar 31 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-1
+- Update to latest release
+- Run tests in parallel
+
+* Tue Mar 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-3
+- Cleanup spec file of old conditionals
+- Use more python2- dependencies
+
+* Mon Feb 05 2018 Karsten Hopp <karsten@redhat.com> - 2.1.2-2
+- update and fix spec file conditionals
+
+* Sun Jan 21 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-1
+- Update to latest release
+
+* Sun Dec 10 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.1-1
+- Update to latest release
+
+* Mon Oct 16 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.0-1
+- Update to latest release
+
+* Thu Sep 28 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.2-1
+- Update to latest release
+
+* Thu Sep 28 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.1-1
+- Update to latest release
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2.0.0-3
+- Fix NVR
+
+* Mon Mar 06 2017 Thomas Spura <tomspur@fedoraproject.org> - 2.0.0-2.2
+- Remove copyrighted file from tarball (gh-8034)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 25 2017 Dan Horák <dan[at]danny.cz> - 2.0.0-2
+- Apply the 'aarch64' test tolerance patch on s390(x) also
+
+* Fri Jan 20 2017 Orion Poplawski <orion@cora.nwra.com> - 2.0.0-1
+- Update to 2.0.0 final
+
+* Tue Jan 10 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.7.rc2
+- Update to 2.0.0rc2
+- Fix more big-endian integer issues
+- Apply the 'aarch64' test tolerance patch on ppc64 also (it's affected by same issues)
+- Tweak the 'i686' test tolerance patch a bit (some errors are gone, some new ones)
+- Re-enable test suite for all arches
+- Note a remaining quasi-random test issue that causes build to fail sometimes
+
+* Mon Jan 09 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.6.b4
+- Fix another integer type issue which caused more issues on ppc64
+
+* Sun Jan 08 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.5.b4
+- Fix int type conversion error that broke text rendering on ppc64 (#1411070)
+
+* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 2.0.0-0.4.b4
+- Rebuild for Python 3.6
+
+* Mon Oct 24 2016 Dan Horák <dan[at]danny.cz> - 2.0.0-0.3.b4
+- disable tests on some alt-arches to unblock depending builds
+
+* Mon Sep 26 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.0.0-0.2.b4
+- add missing runtime dependencies for python2 package
+
+* Sat Sep 10 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.0.0-0.1.b4
+- Update to 2.0.0b4
+- Drop upstreamed or obsolete patches
+- python-cycler >= 0.10.0 is required
+- move around Requires and BRs and sort more or less alphabetically
+- don't ship baseline images for tests (like Debian)
+- Require stix fonts only when they're not bundled
+- disable HTML doc building for bootstrapping 2.0.x series
+- relax image rendering tests tolerance due to freetype version differences
+- disable some failing tests on aarch64 for now
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-0.2.rc2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Fri Jun 03 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-7
+- Update to 1.5.2rc2.
+- Drop wrong hunk from use-system-six patch.
+- Patch new qhull paths on F25+ instead of using sed.
+- Rebase failing tests patch.
+
+* Mon May 23 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-6
+- Upstream no longer ships non-free images, use pristine source.
+
+* Wed May 18 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-5
+- Unbundle python-six (#1336740).
+- Run tests (and temporarily disable failing ones).
+- Use upstream-recommended way of running tests in parallel.
+- python2-cycler and -mock are required for running tests.
+
+* Sat Apr 30 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.5.1-4
+- Rebuild for qhull-2015.2-1.
+- Reflect qhull_a.h's location having changed.
+
+* Wed Apr 6 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-3
+- Add requires python-cycler
+
+* Tue Apr 05 2016 Jon Ciesla <limburgher@gmail.com> - 1.5.1-2
+- Drop agg-devel BR, fix sphinx build with python*cycler BR
+
+* Mon Apr 04 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.5.1-1
+- update to 1.5.1 (#1276806)
+- Add missing requires of dvipng to python3-matplotlib (#1270202)
+- use bundled agg (#1276806)
+- Drop cxx patch (was dropped upstream)
+- Regenerate search path patch2
+
+* Mon Apr 04 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-13
+- Require the qt5 subpackage from the qt4 subpackage (#1219556)
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jan 12 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-11
+- Fix another requires of the main package
+
+* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-10
+- Fix requiring the correct backend from the main package
+
+* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-9
+- regenerate tarball to exclude lena image (#1295174)
+
+* Sun Nov 15 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-8
+- Pick upstream patch for fixing the gdk backend #1231748
+- Add python2 subpackages and use python_provide
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.4.3-5
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Wed Feb 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-4
+- Split out python-matplotlib-gtk, python-matplotlib-gtk3,
+  python3-matplotlib-gtk3 subpackages (#1067373)
+- Add missing requirements on gtk
+
+* Tue Feb 24 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-3
+- Use %%license, add skimage to build requirements
+
+* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-2
+- Disable Qt5 backend on Fedora <21 and RHEL
+
+* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-1
+- New upstream release (#1134007)
+- Add Qt5 backend
+
+* Tue Jan 13 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.2-1
+- Bump to new upstream release
+- Add qhull-devel to BR
+- Add six to Requires
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+
+* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+
+* Tue Feb 11 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-3
+- Make TkAgg the default backend
+- Remove python2 dependency from -data subpackage
+
+* Mon Jan 27 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-2
+- Correct environment for and enable %%check
+- Install system wide matplotlibrc under /etc
+- Do not duplicate mpl-data for python2 and python3 packages
+- Conditionally bundle data fonts (https://fedorahosted.org/fpc/ticket/381)
+
+* Sat Jan 25 2014 Thomas Spura <tomspur@fedoraproject.org> - 1.3.1-1
+- update to 1.3.1
+- use GTKAgg as backend (#1030396, #982793, #1049624)
+- use fontconfig
+- add %%check for local testing (testing requires a display)
+
+* Wed Aug  7 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.3.0-1
+- update to new version
+- use xz to compress sources
+- drop fontconfig patch (upstream)
+- drop tk patch (upstream solved build issue differently)
+- redo use system agg patch
+- delete bundled python-pycxx headers
+- fix requires of python3-matplotlib-qt (fixes #988412)
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Mon Jun 10 2013 Jon Ciesla <limburgher@gmail.com> - 1.2.0-14
 - agg rebuild.
 
@@ -423,7 +792,7 @@ popd
 - fix build with new Tkinter which doesn't return an expected value in __version__
 
 * Thu Sep 15 2011 Jef Spaleta <jspaleta@fedoraproject.org> - 1.0.1-13
-- apply upstream bugfix for timezone formatting (Bug 735677) 
+- apply upstream bugfix for timezone formatting (Bug 735677)
 
 * Fri May 20 2011 Orion Poplawski <orion@cora.nwra.com> - 1.0.1-12
 - Add Requires dvipng (Bug 684836)
@@ -481,20 +850,20 @@ popd
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
 * Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1
-- New upstream release  
-- Remove undistributable file from bundled agg library 
+- New upstream release
+- Remove undistributable file from bundled agg library
 
 * Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1
-- New upstream release  
+- New upstream release
 
 * Thu May 27 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-4
-- Upstream patch to fix deprecated gtk tooltip warning.  
+- Upstream patch to fix deprecated gtk tooltip warning.
 
 * Mon Apr 12 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-2
-- Bump to rebuild against numpy 1.3  
+- Bump to rebuild against numpy 1.3
 
 * Thu Apr 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-1
-- Bump to rebuild against numpy 1.4.0  
+- Bump to rebuild against numpy 1.4.0
 
 * Fri Dec 11 2009 Jon Ciesla <limb@jcomserv.net> - 0.99.1.2
 - Update to 0.99.1.2
@@ -555,7 +924,7 @@ popd
 - Rebuild for Tcl/Tk downgrade
 
 * Sat Feb 10 2007 Jef Spaleta <jspaleta@gmail.com> 0.90.0-2
-- Release bump for rebuild against new tk 
+- Release bump for rebuild against new tk
 
 * Fri Feb 09 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-1
 - Update to 0.90.0
@@ -617,7 +986,7 @@ popd
 - New upstream version 0.84
 
 * Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-3
-- bump release 
+- bump release
 
 * Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-2
 - Add Requires: python-numeric, pytz, python-dateutil

setup.cfg

@@ -0,0 +1,4 @@
+[packages]
+tests = True
+toolkits = True
+toolkits_tests = True

sources

@@ -1 +1,2 @@
-2add984c264ecdfc4a212f914736b78c  matplotlib-1.2.0-without-gpc.tar.gz
+SHA512 (matplotlib-3.0.3.tar.gz) = 9fe00b8d0ca6dcf2f1b907118b656353e115b73f8b21adeb4391c87e164c111a4994c3ac17cdd02e75b896d9aa26c279618132f9a7bfe995c0f7c62356ed85ad
+SHA512 (matplotlib-3.0.1-with-freetype-2.9.1.tar.gz) = 7d2f9fa2a1ae58107283877cbb96d74f79cfda4d6328bdee90d88b2a286eaad9ae8ff6d764f10a5c05eec6fb5de8598cada168fe7c85d33bd07873fdfc142e3a