Restore missing sources.

These tests overwrite certain names that causes issues when testing in
parallel. These tests will be gone with Matplotlib 3.0, so I don't want
to spend much time fixing them. Just ignore them and run in serial
afterwards.

.gitignore

@@ -9,3 +9,21 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /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-2.2.4.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,116 @@
+From d873c282f4ab93f14c6b4ac6f4210852024dba78 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Sat, 2 Mar 2019 18:18:29 -0500
+Subject: [PATCH] Use packaged jquery and jquery-ui.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ .../backends/web_backend/all_figures.html     |  6 +--
+ .../backends/web_backend/single_figure.html   |  6 +--
+ setup.py                                      | 49 -------------------
+ 3 files changed, 6 insertions(+), 55 deletions(-)
+
+diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html
+index 41f48dc6d..69097eb4f 100644
+--- a/lib/matplotlib/backends/web_backend/all_figures.html
++++ b/lib/matplotlib/backends/web_backend/all_figures.html
+@@ -3,9 +3,9 @@
+     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
+     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
+     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
+-    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
+-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
+-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
++    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
++    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
++    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
+     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
+     <script src="{{ prefix }}/js/mpl.js"></script>
+ 
+diff --git a/lib/matplotlib/backends/web_backend/single_figure.html b/lib/matplotlib/backends/web_backend/single_figure.html
+index 4d5a366fb..c11c86618 100644
+--- a/lib/matplotlib/backends/web_backend/single_figure.html
++++ b/lib/matplotlib/backends/web_backend/single_figure.html
+@@ -3,9 +3,9 @@
+     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
+     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
+     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
+-    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
+-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
+-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
++    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
++    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
++    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
+     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
+     <script src="{{ prefix }}/js/mpl.js"></script>
+     <script>
+diff --git a/setup.py b/setup.py
+index 41037e95d..7a0af717f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -35,8 +35,6 @@ from zipfile import ZipFile
+ 
+ from setuptools import setup
+ from setuptools.command.build_ext import build_ext as BuildExtCommand
+-from setuptools.command.develop import develop as DevelopCommand
+-from setuptools.command.install_lib import install_lib as InstallLibCommand
+ from setuptools.command.test import test as TestCommand
+ 
+ # The setuptools version of sdist adds a setup.cfg file to the tree.
+@@ -146,53 +144,6 @@ cmdclass['test'] = NoopTestCommand
+ cmdclass['build_ext'] = BuildExtraLibraries
+ 
+ 
+-def _download_jquery_to(dest):
+-    # Note: When bumping the jquery-ui version, also update the versions in
+-    # single_figure.html and all_figures.html.
+-    url = "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
+-    sha = 'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
+-    if not os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
+-        _makedirs(dest, exist_ok=True)
+-        try:
+-            buff = download_or_cache(url, sha)
+-        except Exception:
+-            raise IOError("Failed to download jquery-ui.  Please download " +
+-                          "{url} and extract it to {dest}.".format(
+-                              url=url, dest=dest))
+-        with ZipFile(buff) as zf:
+-            zf.extractall(dest)
+-
+-
+-# Relying on versioneer's implementation detail.
+-_orgin_sdist = cmdclass['sdist']
+-
+-
+-class sdist_with_jquery(_orgin_sdist):
+-    def make_release_tree(self, base_dir, files):
+-        _orgin_sdist.make_release_tree(self, base_dir, files)
+-        _download_jquery_to(
+-            os.path.join(base_dir, "lib/matplotlib/backends/web_backend/"))
+-
+-
+-# Affects install and bdist_wheel.
+-class install_lib_with_jquery(InstallLibCommand):
+-    def run(self):
+-        InstallLibCommand.run(self)
+-        _download_jquery_to(
+-            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
+-
+-
+-class develop_with_jquery(DevelopCommand):
+-    def run(self):
+-        DevelopCommand.run(self)
+-        _download_jquery_to("lib/matplotlib/backends/web_backend/")
+-
+-
+-cmdclass['sdist'] = sdist_with_jquery
+-cmdclass['install_lib'] = install_lib_with_jquery
+-cmdclass['develop'] = develop_with_jquery
+-
+-
+ # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
+ # however, this is needed on Windows to avoid creating infinite subprocesses
+ # when using multiprocessing.
+-- 
+2.20.1
+

0001-matplotlibrc-path-search-fix.patch

@@ -0,0 +1,97 @@
+From 84ebbed32cf1c0f4d56a6191ce7470fda6ea0543 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            |  8 +++++---
+ lib/matplotlib/tests/test_rcparams.py | 22 ++++++++++++++++------
+ 2 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index c5accc3c3..bc38f316c 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -738,9 +738,12 @@ def _get_data_path():
+ 
+     _file = _decode_filesystem_path(__file__)
+     path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
++    path = '/usr/share/matplotlib/mpl-data'
+     if os.path.isdir(path):
+         return path
+ 
++    raise RuntimeError('Could not find the matplotlib data files')
++
+     # setuptools' namespace_packages may highjack this init file
+     # so need to try something known to be in matplotlib, not basemap
+     import matplotlib.afm
+@@ -821,8 +824,7 @@ def matplotlib_fname():
+ 
+          - `$HOME/.matplotlib/matplotlibrc` if `$HOME` is defined.
+ 
+-    - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
+-      system-defined copy.
++    - Lastly, it looks in `/etc/matplotlibrc` for a system-defined copy.
+     """
+ 
+     def gen_candidates():
+@@ -835,7 +837,7 @@ def matplotlib_fname():
+             yield matplotlibrc
+             yield os.path.join(matplotlibrc, 'matplotlibrc')
+         yield os.path.join(_get_configdir(), 'matplotlibrc')
+-        yield os.path.join(get_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 c0378e1bf..7f14bcc46 100644
+--- a/lib/matplotlib/tests/test_rcparams.py
++++ b/lib/matplotlib/tests/test_rcparams.py
+@@ -424,14 +424,25 @@ def test_rcparams_reset_after_fail():
+         assert mpl.rcParams['text.usetex'] is False
+ 
+ 
+-def test_if_rctemplate_is_up_to_date():
++@pytest.fixture
++def mplrc():
++    # This is the Fedora-specific location ...
++    if 'MATPLOTLIBDATA' in os.environ:
++        # ... in buildroot.
++        return os.path.join(os.environ['MATPLOTLIBDATA'],
++                            '../../../../etc/matplotlibrc')
++    else:
++        # ... on installed systems.
++        return '/etc/matplotlibrc'
++
++
++def test_if_rctemplate_is_up_to_date(mplrc):
+     # This tests if the matplotlibrc.template file
+     # contains all valid rcParams.
+     dep1 = mpl._all_deprecated
+     dep2 = mpl._deprecated_set
+     deprecated = list(dep1.union(dep2))
+-    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
+-    with open(path_to_rc, "r") as f:
++    with open(mplrc, "r") as f:
+         rclines = f.readlines()
+     missing = {}
+     for k, v in mpl.defaultParams.items():
+@@ -453,11 +464,10 @@ def test_if_rctemplate_is_up_to_date():
+                          .format(missing.items()))
+ 
+ 
+-def test_if_rctemplate_would_be_valid(tmpdir):
++def test_if_rctemplate_would_be_valid(tmpdir, mplrc):
+     # This tests if the matplotlibrc.template file would result in a valid
+     # rc file if all lines are uncommented.
+-    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
+-    with open(path_to_rc, "r") as f:
++    with open(mplrc, "r") as f:
+         rclines = f.readlines()
+     newlines = []
+     for line in rclines:
+-- 
+2.20.1
+

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

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

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

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

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

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

20_matplotlibrc_path_search_fix.patch

@@ -1,36 +0,0 @@
---- a/lib/matplotlib/__init__.py	2016-04-04 12:54:26.427194940 +0200
-+++ b/lib/matplotlib/__init__.py	2016-04-04 12:56:12.662590255 +0200
-@@ -682,9 +682,12 @@
- 
-     _file = _decode_filesystem_path(__file__)
-     path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
-+    path = '/usr/share/matplotlib/mpl-data'
-     if os.path.isdir(path):
-         return path
- 
-+    raise RuntimeError('Could not find the matplotlib data files')
-+
-     # setuptools' namespace_packages may highjack this init file
-     # so need to try something known to be in matplotlib, not basemap
-     import matplotlib.afm
-@@ -812,7 +815,7 @@
-                     home, '.matplotlib', 'matplotlibrc')
-             return fname
- 
--    path = get_data_path()  # guaranteed to exist or raise
-+    path = '/etc'  # guaranteed to exist or raise
-     fname = os.path.join(path, 'matplotlibrc')
-     if not os.path.exists(fname):
-         warnings.warn('Could not find matplotlibrc; using defaults')
---- a/lib/matplotlib/cbook.py	2016-05-20 14:14:52.000000000 +0200
-+++ b/lib/matplotlib/cbook.py	2016-05-20 19:28:57.373601582 +0200
-@@ -823,8 +823,7 @@ def get_sample_data(fname, asfileobj=Tru
-     if matplotlib.rcParams['examples.directory']:
-         root = matplotlib.rcParams['examples.directory']
-     else:
--        root = os.path.join(os.path.dirname(__file__),
--                            "mpl-data", "sample_data")
-+        root = os.path.join(matplotlib._get_data_path(), 'sample_data')
-     path = os.path.join(root, fname)
- 
-     if asfileobj:

70_bts720549_try_StayPuft_for_xkcd.patch

@@ -1,19 +0,0 @@
-Description: Try to use also StayPuft (a free font) for xkcd
-Author: Sandro Tosi <morph@debian.org>
-Origin: vendor
-Bug: http://bugs.debian.org/720549
-Forwarded: not-needed
-Last-Update: 2013-10-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/matplotlib/pyplot.py
-+++ b/lib/matplotlib/pyplot.py
-@@ -301,7 +301,7 @@ def xkcd(scale=1, length=100, randomness
-     from matplotlib import patheffects
-     context = rc_context()
-     try:
--        rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS']
-+        rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS', 'StayPuft']
-         rcParams['font.size'] = 14.0
-         rcParams['path.sketch'] = (scale, length, randomness)
-         rcParams['path.effects'] = [

python-matplotlib-disable-failing-tests-armv7hl.patch

@@ -1,32 +0,0 @@
-diff -up matplotlib-1.5.1/lib/matplotlib/tests/test_image.py.tests matplotlib-1.5.1/lib/matplotlib/tests/test_image.py
---- matplotlib-1.5.1/lib/matplotlib/tests/test_image.py.tests	2016-05-23 14:04:41.000000000 +0200
-+++ matplotlib-1.5.1/lib/matplotlib/tests/test_image.py	2016-06-02 00:28:37.076703843 +0200
-@@ -186,7 +186,8 @@ def test_cursor_data():
- 
-     event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
-     z = im.get_cursor_data(event)
--    assert z is None, "Did not get None, got %d" % z
-+    #0 instead of None on armv7hl
-+    #assert z is None, "Did not get None, got %d" % z
- 
-     # Hmm, something is wrong here... I get 0, not None...
-     # But, this works further down in the tests with extents flipped
-@@ -224,14 +225,16 @@ def test_cursor_data():
- 
-     event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
-     z = im.get_cursor_data(event)
--    assert z is None, "Did not get None, got %d" % z
-+    #0 instead of None on armv7hl
-+    #assert z is None, "Did not get None, got %d" % z
- 
-     x, y = 0.01, -0.01
-     xdisp, ydisp = ax.transData.transform_point([x, y])
- 
-     event = MouseEvent('motion_notify_event', fig.canvas, xdisp, ydisp)
-     z = im.get_cursor_data(event)
--    assert z is None, "Did not get None, got %d" % z
-+    #0 instead of None on armv7hl
-+    #assert z is None, "Did not get None, got %d" % z
- 
- 
- @image_comparison(baseline_images=['image_clip'])

python-matplotlib-disable-failing-tests.patch

@@ -1,167 +0,0 @@
-diff -up matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py
---- matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py.tests	2016-05-27 04:19:34.000000000 +0200
-+++ matplotlib-1.5.2rc2/lib/matplotlib/sphinxext/tests/test_tinypages.py	2016-06-18 00:51:20.449769054 +0200
-@@ -1,6 +1,7 @@
- """ Tests for tinypages build using sphinx extensions """
- 
- import shutil
-+import sys
- import tempfile
- 
- from os.path import (join as pjoin, dirname, isdir)
-@@ -16,6 +17,8 @@ TINY_PAGES = pjoin(HERE, 'tinypages')
- 
- def setup():
-     # Check we have the sphinx-build command
-+    if sys.version_info[0] >= 3:
-+        raise SkipTest('sphinx-build works only with python 2.x')
-     try:
-         ret = call(['sphinx-build', '--help'], stdout=PIPE, stderr=PIPE)
-     except OSError:
-diff -up matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py.tests matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py
---- matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py.tests	2016-05-27 04:19:34.000000000 +0200
-+++ matplotlib-1.5.2rc2/lib/matplotlib/tests/test_axes.py	2016-06-18 01:07:54.058379133 +0200
-@@ -5,6 +5,7 @@ import six
- from six.moves import xrange
- from itertools import chain
- import io
-+from distutils.version import LooseVersion
- 
- from nose.tools import assert_equal, assert_raises, assert_false, assert_true
- from nose.plugins.skip import SkipTest
-@@ -84,7 +85,7 @@ def test_formatter_ticker():
- 
- @image_comparison(baseline_images=["formatter_large_small"])
- def test_formatter_large_small():
--    if tuple(map(int, np.__version__.split('.'))) >= (1, 11, 0):
-+    if LooseVersion(np.__version__) >= LooseVersion('1.11.0'):
-         raise KnownFailureTest("Fall out from a fixed numpy bug")
-     # github issue #617, pull #619
-     fig, ax = plt.subplots(1)
-diff -up matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py.tests matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py
---- matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py.tests	2016-06-18 00:51:19.000000000 +0200
-+++ matplotlib-1.5.2rc2/lib/matplotlib/tests/test_bbox_tight.py	2016-06-18 01:09:11.314805850 +0200
-@@ -3,6 +3,7 @@ from __future__ import (absolute_import,
- 
- import six
- from six.moves import xrange
-+from distutils.version import LooseVersion
- 
- import numpy as np
- 
-@@ -91,7 +92,7 @@ def test_bbox_inches_tight_clipping():
-                   remove_text=True, savefig_kwarg={'bbox_inches': 'tight'})
- def test_bbox_inches_tight_raster():
-     """Test rasterization with tight_layout"""
--    if tuple(map(int, np.__version__.split('.'))) >= (1, 11, 0):
-+    if LooseVersion(np.__version__) >= LooseVersion('1.11.0'):
-         raise KnownFailureTest("Fall out from a fixed numpy bug")
-     fig = plt.figure()
-     ax = fig.add_subplot(111)
-diff -up matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py.tests matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py
---- matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py.tests	2016-06-18 00:51:19.803773859 +0200
-+++ matplotlib-1.5.2rc2/lib/matplotlib/tests/test_text.py	2016-06-18 00:51:20.450769046 +0200
-@@ -18,91 +18,6 @@ from matplotlib.text import Annotation,
- from matplotlib.backends.backend_agg import RendererAgg
- 
- 
--@image_comparison(baseline_images=['font_styles'])
--def test_font_styles():
--    from matplotlib import _get_data_path
--    data_path = _get_data_path()
--
--    def find_matplotlib_font(**kw):
--        prop = FontProperties(**kw)
--        path = findfont(prop, directory=data_path)
--        return FontProperties(fname=path)
--
--    from matplotlib.font_manager import FontProperties, findfont
--    warnings.filterwarnings(
--        'ignore',
--        ('findfont: Font family \[u?\'Foo\'\] not found. Falling back to .'),
--        UserWarning,
--        module='matplotlib.font_manager')
--
--    plt.figure()
--    ax = plt.subplot(1, 1, 1)
--
--    normalFont = find_matplotlib_font(
--        family="sans-serif",
--        style="normal",
--        variant="normal",
--        size=14)
--    ax.annotate(
--        "Normal Font",
--        (0.1, 0.1),
--        xycoords='axes fraction',
--        fontproperties=normalFont)
--
--    boldFont = find_matplotlib_font(
--        family="Foo",
--        style="normal",
--        variant="normal",
--        weight="bold",
--        stretch=500,
--        size=14)
--    ax.annotate(
--        "Bold Font",
--        (0.1, 0.2),
--        xycoords='axes fraction',
--        fontproperties=boldFont)
--
--    boldItemFont = find_matplotlib_font(
--        family="sans serif",
--        style="italic",
--        variant="normal",
--        weight=750,
--        stretch=500,
--        size=14)
--    ax.annotate(
--        "Bold Italic Font",
--        (0.1, 0.3),
--        xycoords='axes fraction',
--        fontproperties=boldItemFont)
--
--    lightFont = find_matplotlib_font(
--        family="sans-serif",
--        style="normal",
--        variant="normal",
--        weight=200,
--        stretch=500,
--        size=14)
--    ax.annotate(
--        "Light Font",
--        (0.1, 0.4),
--        xycoords='axes fraction',
--        fontproperties=lightFont)
--
--    condensedFont = find_matplotlib_font(
--        family="sans-serif",
--        style="normal",
--        variant="normal",
--        weight=500,
--        stretch=100,
--        size=14)
--    ax.annotate(
--        "Condensed Font",
--        (0.1, 0.5),
--        xycoords='axes fraction',
--        fontproperties=condensedFont)
--
--    ax.set_xticks([])
--    ax.set_yticks([])
- 
- 
- @image_comparison(baseline_images=['multiline'])
-diff -up matplotlib-1.5.2rc2/tests.py.tests matplotlib-1.5.2rc2/tests.py
---- matplotlib-1.5.2rc2/tests.py.tests	2016-05-27 04:19:34.000000000 +0200
-+++ matplotlib-1.5.2rc2/tests.py	2016-06-18 00:51:20.450769046 +0200
-@@ -66,7 +66,7 @@ if __name__ == '__main__':
-     if '--no-network' in sys.argv:
-         from matplotlib.testing import disable_internet
-         disable_internet.turn_off_internet()
--        extra_args.extend(['--eval-attr="not network"'])
-+        extra_args.extend(['-a','!network'])
-         sys.argv.remove('--no-network')
- 
-     run(extra_args)

python-matplotlib-noagg.patch

@@ -1,33 +0,0 @@
---- setupext.py.orig	2013-08-02 09:39:43.914247832 +0200
-+++ setupext.py	2013-08-02 09:40:14.785304342 +0200
-@@ -914,28 +914,13 @@ class LibAgg(SetupPackage):
-         self.__class__.found_external = True
-         try:
-             return self._check_for_pkg_config(
--                'libagg', 'agg2/agg_basics.h', min_version='PATCH')
-+                'libagg', 'agg2/agg_basics.h', min_version='2.5.0')
-         except CheckFailed as e:
-             self.__class__.found_external = False
-             return str(e) + ' Using local copy.'
- 
-     def add_flags(self, ext):
--        if self.found_external:
--            pkg_config.setup_extension(ext, 'libagg')
--        else:
--            ext.include_dirs.append('extern/agg24/include')
--            agg_sources = [
--                'agg_bezier_arc.cpp',
--                'agg_curves.cpp',
--                'agg_image_filters.cpp',
--                'agg_trans_affine.cpp',
--                'agg_vcgen_contour.cpp',
--                'agg_vcgen_dash.cpp',
--                'agg_vcgen_stroke.cpp',
--                'agg_vpgen_segmentator.cpp'
--                ]
--            ext.sources.extend(
--                os.path.join('extern', 'agg24', 'src', x) for x in agg_sources)
-+        pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
- 
- 
- class FreeType(SetupPackage):

python-matplotlib-qhull.patch

@@ -1,24 +0,0 @@
-diff -up matplotlib-1.5.2rc2/setupext.py.qh matplotlib-1.5.2rc2/setupext.py
---- matplotlib-1.5.2rc2/setupext.py.qh	2016-06-04 00:09:22.605827942 +0200
-+++ matplotlib-1.5.2rc2/setupext.py	2016-06-04 00:09:22.611827972 +0200
-@@ -1018,7 +1018,7 @@ class Qhull(SetupPackage):
-             # present on this system, so check if the header files can be
-             # found.
-             include_dirs = [
--                os.path.join(x, 'qhull') for x in get_include_dirs()]
-+                os.path.join(x, 'libqhull') for x in get_include_dirs()]
-             if has_include_file(include_dirs, 'qhull_a.h'):
-                 return 'Using system Qhull (version unknown, no pkg-config info)'
-             else:
-diff -up matplotlib-1.5.2rc2/src/qhull_wrap.c.qh matplotlib-1.5.2rc2/src/qhull_wrap.c
---- matplotlib-1.5.2rc2/src/qhull_wrap.c.qh	2016-05-27 04:19:34.000000000 +0200
-+++ matplotlib-1.5.2rc2/src/qhull_wrap.c	2016-06-04 00:09:22.608827957 +0200
-@@ -7,7 +7,7 @@
-  */
- #include "Python.h"
- #include "numpy/noprefix.h"
--#include "qhull/qhull_a.h"
-+#include <libqhull/qhull_a.h>
- #include <stdio.h>
- 
- 

python-matplotlib-use-system-six.patch

@@ -1,34 +0,0 @@
-diff -up matplotlib-1.5.1/setupext.py.six matplotlib-1.5.1/setupext.py
---- matplotlib-1.5.1/setupext.py.six	2016-01-10 23:20:20.000000000 +0100
-+++ matplotlib-1.5.1/setupext.py	2016-05-18 13:44:21.534494158 +0200
-@@ -1026,6 +1026,18 @@ class Qhull(SetupPackage):
-             ext.sources.extend(glob.glob('extern/qhull/*.c'))
- 
- 
-+class Six(SetupPackage):
-+    name = "six"
-+
-+    def check(self):
-+        try:
-+            import six
-+        except ImportError:
-+            return 'not found. pip may install it below.'
-+
-+        return 'version %s' % six.__version__
-+
-+
- class TTConv(SetupPackage):
-     name = "ttconv"
- 
-diff -up matplotlib-1.5.1/setup.py.six matplotlib-1.5.1/setup.py
---- matplotlib-1.5.1/setup.py.six	2016-01-10 23:20:20.000000000 +0100
-+++ matplotlib-1.5.1/setup.py	2016-05-18 13:44:21.528494040 +0200
-@@ -84,7 +84,7 @@ mpl_packages = [
-     setupext.Delaunay(),
-     setupext.QhullWrap(),
-     setupext.Tri(),
--    setupext.Externals(),
-+    setupext.Six(),
-     'Optional subpackages',
-     setupext.SampleData(),
-     setupext.Toolkits(),

python-matplotlib.spec

@@ -1,26 +1,13 @@
-%if 0%{?fedora}
-%global with_python3            1
-%else
-%global with_python3            0
-%endif
-%global __provides_exclude_from .*/site-packages/.*\\.so$
-%global with_html               1
+%global with_html               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
 
-# On RHEL 7 onwards, don't build with wx:
-%if 0%{?rhel} >= 7
-%global with_wx 0
-%else
-%global with_wx 1
-%endif
-
-# On Fedora 21 onwards, enable Qt5 backend:
-%if 0%{?fedora}
-%global with_qt5 1
-%else
-%global with_qt5 0
-%endif
-
 # the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
 # CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
 %global backend                 TkAgg
@@ -43,64 +30,56 @@
 # Use the same directory of the main package for subpackage licence and docs
 %global _docdir_fmt %{name}
 
-%global rctag rc2
+#global rctag rc1
+
+# Updated test images for new FreeType.
+%global mpl_images_version 2.2.3
+
+# The version of FreeType in this Fedora branch.
+%if %{fedora} >= 29
+%global ftver 2.9.1
+%else
+%global ftver 2.8
+%endif
 
 Name:           python-matplotlib
-Version:        1.5.2
-Release:        0.2%{?rctag:.%{rctag}}%{?dist}
+Version:        2.2.4
+Release:        1%{?rctag:.%{rctag}}%{?dist}
 Summary:        Python 2D plotting library
-Group:          Development/Libraries
 # qt4_editor backend is MIT
 License:        Python and MIT
 URL:            http://matplotlib.org
-Source0:        https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}.tar.gz#/matplotlib-%{version}%{?rctag}.tar.gz
+Source0:        https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}/matplotlib-%{version}%{?rctag}.tar.gz
 Source1:        setup.cfg
 
-#Patch0:         %{name}-noagg.patch
-# https://github.com/matplotlib/matplotlib/issues/6536
-Patch2:         20_matplotlibrc_path_search_fix.patch
-Patch5:         70_bts720549_try_StayPuft_for_xkcd.patch
-# https://github.com/matplotlib/matplotlib/issues/6537
-Patch6:         python-matplotlib-use-system-six.patch
-# https://github.com/matplotlib/matplotlib/pull/6558
-# https://github.com/matplotlib/matplotlib/issues/6539
-Patch7:         python-matplotlib-disable-failing-tests.patch
-# https://github.com/matplotlib/matplotlib/issues/6538
-Patch8:         python-matplotlib-disable-failing-tests-armv7hl.patch
-Patch9:         python-matplotlib-qhull.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
+
+# 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:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  qhull-devel
-BuildRequires:  python-six
-BuildRequires:  numpy
-BuildRequires:  pyparsing
-BuildRequires:  python-pycxx-devel
-BuildRequires:  python-dateutil
-BuildRequires:  python-setuptools
-%if %{with_html}
-BuildRequires:  python-ipython-sphinx
-BuildRequires:  python-numpydoc
-BuildRequires:  python-scikit-image
-BuildRequires:  python2-cycler
-%endif
-%if %{run_tests}
-BuildRequires:  python-nose
-BuildRequires:  python2-cycler
-BuildRequires:  python2-mock
-%if %{with_python3}
-BuildRequires:  python3-mock
-BuildRequires:  python3-nose
-%endif
-%endif
-BuildRequires:  python2-devel
-BuildRequires:  pytz
+BuildRequires:  texlive-cm
 BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  zlib-devel
 
-Provides:       bundled(agg) = 2.4
-Provides:       bundled(ttconv)
-
 %description
 Matplotlib is a python 2D plotting library which produces publication
 quality figures in a variety of hardcopy formats and interactive
@@ -114,23 +93,61 @@ errorcharts, scatterplots, etc, with just a few lines of code.
 
 %package -n python2-matplotlib
 Summary:        Python 2D plotting library
-%{?python_provide:%python_provide python2-matplotlib}
+BuildRequires:  python2-numpy
+BuildRequires:  python2-pyparsing
+BuildRequires:  python2-dateutil
+BuildRequires:  python2-kiwisolver
+BuildRequires:  python2-pyside
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-six
+BuildRequires:  python2-sphinx
+BuildRequires:  python2-subprocess32
+BuildRequires:  python2-devel
+BuildRequires:  python2-backports-functools_lru_cache
+BuildRequires:  python2-pillow
+BuildRequires:  python2-pytz
+%if %{with_html}
+BuildRequires:  %{_bindir}/pdftops
+# circular dependency: python2-basemap requires matplotlib
+BuildRequires:  python2-basemap
+BuildRequires:  python2-ipython-sphinx
+BuildRequires:  python2-numpydoc
+BuildRequires:  python2-scikit-image
+BuildRequires:  python2-colorspacious
+BuildRequires:  python2-cycler >= 0.10.0
+%endif
+%if %{run_tests}
+BuildRequires:  python2-pytest
+BuildRequires:  python2-pytest-xdist
+BuildRequires:  python2-cycler >= 0.10.0
+BuildRequires:  python2-mock
+%endif
 Requires:       dejavu-sans-fonts
 Requires:       dvipng
-Requires:       python-six
-Requires:       numpy
-Requires:       pyparsing
-Requires:       python2-cycler
-Requires:       python-dateutil
-Requires:       pytz
-%if 0%{?fedora} >= 18
+Requires:       python2-numpy
+Requires:       python2-pyparsing
+Requires:       python2-cycler >= 0.10.0
+Requires:       python2-dateutil
+Requires:       python2-kiwisolver
+Requires:       python2-backports-functools_lru_cache
+Requires:       python-matplotlib-data = %{version}-%{release}
+%{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}
+Recommends:     python2-pillow
+Requires:       python2-six
+Requires:       python2-subprocess32
+Requires:       python2-pytz
+%if !%{with_bundled_fonts}
 Requires:       stix-math-fonts
 %else
-Requires:       stix-fonts
+Provides:       bundled(stix-math-fonts)
 %endif
-Requires:       %{name}-data = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib}
+Provides:       bundled(agg) = 2.4
+Provides:       bundled(ttconv)
+Provides:       bundled(js-jquery1) = 1.11.3
+Provides:       bundled(js-jquery1-ui) = 1.11.4
+Provides:       bundled(texlive-helvetic)
 
-%{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}
 %description -n python2-matplotlib
 Matplotlib is a python 2D plotting library which produces publication
 quality figures in a variety of hardcopy formats and interactive
@@ -143,155 +160,157 @@ You can generate plots, histograms, power spectra, bar charts,
 errorcharts, scatterplots, etc, with just a few lines of code.
 
 %package -n python2-matplotlib-qt4
-%{?python_provide:%python_provide python2-matplotlib-qt4}
 Summary:        Qt4 backend for python-matplotlib
-Group:          Development/Libraries
+BuildRequires:  PyQt4-devel
+Requires:       python2-PyQt4
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python2-matplotlib-qt5
-BuildRequires:  PyQt4-devel
-Requires:       PyQt4
+%{?python_provide:%python_provide python2-matplotlib-qt4}
 
 %description -n python2-matplotlib-qt4
 %{summary}
 
-%if %{with_qt5}
 %package -n python2-matplotlib-qt5
-%{?python_provide:%python_provide python2-matplotlib-qt5}
 Summary:        Qt5 backend for python-matplotlib
-Group:          Development/Libraries
+BuildRequires:  python2-qt5
+Requires:       python2-qt5
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
-BuildRequires:  python-qt5
-Requires:       python-qt5
+%{?python_provide:%python_provide python2-matplotlib-qt5}
 
 %description -n python2-matplotlib-qt5
 %{summary}
-%endif # with_qt5
 
 %package -n python2-matplotlib-gtk
-%{?python_provide:%python_provide python2-matplotlib-gtk}
 Summary:        GTK backend for python-matplotlib
-Group:          Development/Libraries
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  gtk2-devel
-BuildRequires:  pygtk2-devel
 BuildRequires:  pycairo-devel
+BuildRequires:  pygtk2-devel
 Requires:       pycairo
 Requires:       pygtk2
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-gtk}
 
 %description -n python2-matplotlib-gtk
 %{summary}
 
 %package -n python2-matplotlib-gtk3
-%{?python_provide:%python_provide python2-matplotlib-gtk3}
 Summary:        GTK3 backend for python-matplotlib
-Group:          Development/Libraries
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 # This should be converted to typelib(Gtk) when supported
 BuildRequires:  gtk3
 BuildRequires:  pygobject3-base
 Requires:       gtk3%{?_isa}
 Requires:       pygobject3-base%{?_isa}
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-gtk3}
 
 %description -n python2-matplotlib-gtk3
 %{summary}
 
 %package -n python2-matplotlib-tk
-%{?python_provide:%python_provide python2-matplotlib-tk}
 Summary:        Tk backend for python-matplotlib
-Group:          Development/Libraries
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  tcl-devel
 BuildRequires:  tkinter
 BuildRequires:  tk-devel
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       tkinter
+%{?python_provide:%python_provide python2-matplotlib-tk}
 
 %description -n python2-matplotlib-tk
 %{summary}
 
-%if %{with_wx}
 %package -n python2-matplotlib-wx
-%{?python_provide:%python_provide python2-matplotlib-wx}
 Summary:        wxPython backend for python-matplotlib
-Group:          Development/Libraries
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  wxPython-devel
-Requires:       wxPython
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+Requires:       python2-wxpython
+%{?python_provide:%python_provide python2-matplotlib-wx}
 
 %description -n python2-matplotlib-wx
 %{summary}
-%endif # with_wx
+
+%package -n python2-matplotlib-test-data
+Summary:        Test data for python2-matplotlib
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-test-data}
+
+%description -n python2-matplotlib-test-data
+%{summary}
 
 %package -n python2-matplotlib-doc
-%{?python_provide:%python_provide python2-matplotlib-doc}
 Summary:        Documentation files for python-matplotlib
-Group:          Documentation
-Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 %if %{with_html}
-BuildRequires:  python-sphinx
-BuildRequires:  tex(latex)
-BuildRequires:  tex-preview
 BuildRequires:  dvipng
 BuildRequires:  graphviz
+BuildRequires:  python2-sphinx
+BuildRequires:  tex(latex)
+BuildRequires:  tex-preview
 %endif
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-doc}
 
 %description -n python2-matplotlib-doc
 %{summary}
 
 %package -n python-matplotlib-data
-%{?python_provide:%python_provide python-matplotlib-data}
 Summary:        Data used by python-matplotlib
+BuildArch:      noarch
 %if %{with_bundled_fonts}
 Requires:       python-matplotlib-data-fonts = %{version}-%{release}
 %endif
-BuildArch:      noarch
+%{?python_provide:%python_provide python-matplotlib-data}
 
 %description -n python-matplotlib-data
 %{summary}
 
 %if %{with_bundled_fonts}
 %package -n python-matplotlib-data-fonts
-%{?python_provide:%python_provide python-matplotlib-data-fonts}
 Summary:        Fonts used by python-matplotlib
-Requires:       python-matplotlib-data = %{version}-%{release}
 BuildArch:      noarch
+Requires:       python-matplotlib-data = %{version}-%{release}
+%{?python_provide:%python_provide python-matplotlib-data-fonts}
 
 %description -n python-matplotlib-data-fonts
 %{summary}
 %endif
 
-%if %{with_python3}
 %package -n     python3-matplotlib
-%{?python_provide:%python_provide 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-pycxx-devel
+BuildRequires:  python3-pillow
 BuildRequires:  python3-pyparsing
 BuildRequires:  python3-pytz
 BuildRequires:  python3-six
-BuildRequires:  python3-cycler
-Requires:       python3-six
-Requires:       python3-numpy
-Requires:       python3-cairo
-Requires:       python3-pyparsing
-Requires:       python3-cycler
-Requires:       python3-dateutil
-Requires:       python3-pytz
+BuildRequires:  python3-sphinx
 Requires:       dejavu-sans-fonts
 Requires:       dvipng
-%if 0%{?fedora} >= 18
+Requires:       python-matplotlib-data = %{version}-%{release}
+Requires:       python3-cairo
+Requires:       python3-cycler >= 0.10.0
+Requires:       python3-dateutil
+Requires:       python3-kiwisolver
+Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
+%if %{run_tests}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-xdist
+%endif
+Requires:       python3-numpy
+Recommends:     python3-pillow
+Requires:       python3-pyparsing
+Requires:       python3-pytz
+Requires:       python3-six
+%if !%{with_bundled_fonts}
 Requires:       stix-math-fonts
 %else
-Requires:       stix-fonts
+Provides:       bundled(stix-math-fonts)
 %endif
-Requires:       %{name}-data = %{version}-%{release}
-
-Requires: python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-matplotlib}
 
 %description -n python3-matplotlib
 Matplotlib is a python 2D plotting library which produces publication
@@ -305,60 +324,79 @@ You can generate plots, histograms, power spectra, bar charts,
 errorcharts, scatterplots, etc, with just a few lines of code.
 
 %package -n     python3-matplotlib-qt4
-%{?python_provide:%python_provide python3-matplotlib-qt4}
 Summary:        Qt4 backend for python3-matplotlib
-Group:          Development/Libraries
+BuildRequires:  python3-PyQt4-devel
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3-matplotlib-qt5
-BuildRequires:  python3-PyQt4-devel
 Requires:       python3-PyQt4
+%{?python_provide:%python_provide python3-matplotlib-qt4}
 
 %description -n python3-matplotlib-qt4
 %{summary}
 
-%if %{with_qt5}
 %package -n     python3-matplotlib-qt5
-%{?python_provide:%python_provide python3-matplotlib-qt5}
 Summary:        Qt5 backend for python3-matplotlib
-Group:          Development/Libraries
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 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}
-%endif # with_qt5
 
 # gtk2 never worked in Python 3 afaict, so no need for -gtk subpackage
 %package -n     python3-matplotlib-gtk3
-%{?python_provide:%python_provide python3-matplotlib-gtk3}
 Summary:        GTK3 backend for python3-matplotlib
-Group:          Development/Libraries
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 # 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
-%{?python_provide:%python_provide 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}
-%endif
+
+%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}%{?rctag}
-rm -r {extern/qhull,lib/matplotlib/externals}
+%autosetup -n matplotlib-%{version}%{?rctag} -N
+%patch0001 -p1
+
+%patch0002 -p1
+
+# Fedora-specific patches follow:
+%patch1001 -p1
+# Updated test images for new FreeType.
+gzip -dc %SOURCE1000 | tar xvf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
+%ifnarch x86_64
+%patch1002 -p1
+%endif
+%ifarch aarch64 ppc64 ppc64le s390x
+%patch1004 -p1
+%endif
+%ifarch i686 armv7hl
+%patch1003 -p1
+%endif
+rm -r extern/libqhull
 
 # Copy setup.cfg to the builddir
 sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}
@@ -368,7 +406,7 @@ sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}
 # 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__ = 101\)/\1.1/' lib/matplotlib/font_manager.py
+    sed -i 's/\(__version__ = 200\)/\1.1/' lib/matplotlib/font_manager.py
 fi
 
 %if !%{with_bundled_fonts}
@@ -376,27 +414,9 @@ fi
 sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py
 %endif
 
-%patch2 -p1
-%patch5 -p1
-for f in $(find . -type f -name '*.py' -print) ; do
- if grep -q "matplotlib.externals" $f ; then
-  sed -i -e 's/from matplotlib.externals import six/import six/g' -e 's/from matplotlib.externals.six/from six/g' $f
- fi
-done
-%patch6 -p1 -b .six
-%patch7 -p1 -b .tests
-%ifarch armv7hl
-%patch8 -p1 -b .tests-armv7hl
-%endif
-
-%if 0%{?fedora} > 24
-# Installation paths changed
-%patch9 -p1 -b .qh
-%endif
-
-chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 %build
+export http_proxy=http://127.0.0.1/
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
   xvfb-run %{__python2} setup.py build
@@ -413,18 +433,17 @@ popd
 # package doesn't drag in dependencies
 find examples -name '*.py' -exec chmod a-x '{}' \;
 
-%if %{with_python3}
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
   xvfb-run %{__python3} setup.py build
 # documentation cannot be built with python3 due to syntax errors
 # https://github.com/matplotlib/matplotlib/issues/5805
-%endif
 
 %install
+export http_proxy=http://127.0.0.1/
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
-  %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+  %{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
 chmod +x %{buildroot}%{python2_sitearch}/matplotlib/dates.py
 mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
 mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data/matplotlibrc \
@@ -435,40 +454,84 @@ mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data \
 rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
 %endif
 
-%if %{with_python3}
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
     %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
 chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py
 rm -fr %{buildroot}%{python3_sitearch}/matplotlib/mpl-data
-%endif
 
 %if %{run_tests}
 %check
+# These files confuse pytest, and we want to test the installed copy.
+rm -rf build*/
+
+export http_proxy=http://127.0.0.1/
 # This should match the default backend
 echo "backend      : %{backend}" > matplotlibrc
+# Full tests are not run because pytest doesn't seem to understand namespace
+# packages in PYTHONPATH.
+# Skips:
+#  * test_parasite: imports mpl_toolkits which is broken as noted above.
+#  * test_polycollection_close: imports mpl_toolkits which is broken as noted
+#    above.
+#  * test_invisible_Line_rendering: Checks for "slowness" that often fails on a
+#    heavily-loaded builder.
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python2_sitearch} \
-     xvfb-run -a %{__python2} tests.py --no-network --processes=$(getconf _NPROCESSORS_ONLN) --process-timeout=300
+PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run -a -s "-screen 0 640x480x24" \
+         %{__python2} -m pytest --pyargs matplotlib -ra -n $(getconf _NPROCESSORS_ONLN) \
+             -m 'not network' \
+             -k 'not test_invisible_Line_rendering and not test_parasite and not test_polycollection_close and not test_nose_image_comparison'
 
-%if %{with_python3}
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
-     xvfb-run -a %{__python3} tests.py --no-network --processes=$(getconf _NPROCESSORS_ONLN) --process-timeout=300
-%endif
+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 test_nose_image_comparison'
+
+# We run these separately because they have issues when run in parallel.
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
+PYTHONPATH=%{buildroot}%{python2_sitearch} \
+PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run -a -s "-screen 0 640x480x24" \
+         %{__python2} -m pytest --pyargs matplotlib -ra \
+             -k 'test_nose_image_comparison'
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
+PYTHONPATH=%{buildroot}%{python3_sitearch} \
+PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run -a -s "-screen 0 640x480x24" \
+         %{__python3} tests.py -ra \
+             -k 'test_nose_image_comparison'
 %endif # run_tests
 
+%files -n python-matplotlib-data
+%{_sysconfdir}/matplotlibrc
+%{_datadir}/matplotlib/mpl-data/
+%if %{with_bundled_fonts}
+%exclude %{_datadir}/matplotlib/mpl-data/fonts/
+%endif
+
+%if %{with_bundled_fonts}
+%files -n python-matplotlib-data-fonts
+%{_datadir}/matplotlib/mpl-data/fonts/
+%endif
+
 %files -n python2-matplotlib
 %license LICENSE/
-%doc CONTRIBUTING.md
-%doc CHANGELOG
 %doc README.rst
 %{python2_sitearch}/*egg-info
 %{python2_sitearch}/matplotlib-*-nspkg.pth
 %{python2_sitearch}/matplotlib/
+%exclude %{python2_sitearch}/matplotlib/tests/baseline_images/*
 %{python2_sitearch}/mpl_toolkits/
+%exclude %{python2_sitearch}/mpl_toolkits/tests/baseline_images/*
 %{python2_sitearch}/pylab.py*
 %exclude %{python2_sitearch}/matplotlib/backends/backend_qt4*
 %exclude %{python2_sitearch}/matplotlib/backends/backend_qt5*
@@ -479,17 +542,20 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 %exclude %{python2_sitearch}/matplotlib/backends/_tkagg.so
 %exclude %{python2_sitearch}/matplotlib/backends/backend_wx.*
 %exclude %{python2_sitearch}/matplotlib/backends/backend_wxagg.*
-%exclude %{_pkgdocdir}/*/
+%exclude %{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/*/*
+
+%files -n python2-matplotlib-test-data
+%{python2_sitearch}/matplotlib/tests/baseline_images/
+%{python2_sitearch}/mpl_toolkits/tests/baseline_images/
 
 %files -n python2-matplotlib-qt4
 %{python2_sitearch}/matplotlib/backends/backend_qt4.*
 %{python2_sitearch}/matplotlib/backends/backend_qt4agg.*
 
-%if %{with_qt5}
 %files -n python2-matplotlib-qt5
 %{python2_sitearch}/matplotlib/backends/backend_qt5.*
 %{python2_sitearch}/matplotlib/backends/backend_qt5agg.*
-%endif # with_qt5
 
 %files -n python2-matplotlib-gtk
 %{python2_sitearch}/matplotlib/backends/backend_gtk.py*
@@ -505,11 +571,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 %{python2_sitearch}/matplotlib/backends/tkagg.py*
 %{python2_sitearch}/matplotlib/backends/_tkagg.so
 
-%if %{with_wx}
 %files -n python2-matplotlib-wx
 %{python2_sitearch}/matplotlib/backends/backend_wx.*
 %{python2_sitearch}/matplotlib/backends/backend_wxagg.*
-%endif # with_wx
 
 %files -n python2-matplotlib-doc
 %doc examples
@@ -517,28 +581,15 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 %doc doc/build/html/*
 %endif
 
-%files -n python-matplotlib-data
-%{_sysconfdir}/matplotlibrc
-%{_datadir}/matplotlib/mpl-data/
-%if %{with_bundled_fonts}
-%exclude %{_datadir}/matplotlib/mpl-data/fonts/
-%endif
-
-%if %{with_bundled_fonts}
-%files -n python-matplotlib-data-fonts
-%{_datadir}/matplotlib/mpl-data/fonts/
-%endif
-
-%if %{with_python3}
 %files -n python3-matplotlib
 %license LICENSE/
-%doc CONTRIBUTING.md
-%doc CHANGELOG
 %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*
@@ -554,19 +605,21 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 %exclude %{python3_sitearch}/matplotlib/backends/_tkagg.*
 %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/__pycache__/backend_qt4.*
 %{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
 
-%if %{with_qt5}
 %files -n python3-matplotlib-qt5
 %{python3_sitearch}/matplotlib/backends/backend_qt5.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*
 %{python3_sitearch}/matplotlib/backends/backend_qt5agg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*
-%endif # with_qt5
 
 %files -n python3-matplotlib-gtk3
 %{python3_sitearch}/matplotlib/backends/backend_gtk*
@@ -578,9 +631,107 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 %{python3_sitearch}/matplotlib/backends/tkagg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
 %{python3_sitearch}/matplotlib/backends/_tkagg.*
-%endif
+
 
 %changelog
+* 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
 
@@ -808,7 +959,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 - 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)
@@ -866,20 +1017,20 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 - 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
@@ -940,7 +1091,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 - 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
@@ -1002,7 +1153,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \
 - 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

@@ -1,2 +1,7 @@
+[packages]
+tests = True
+toolkits = True
+toolkits_tests = True
+
 [rc_options]
 backend = GTKAgg

sources

@@ -1 +1,3 @@
-495f6bdf126b40f63c316c9404349e40  matplotlib-1.5.2rc2.tar.gz
+SHA512 (matplotlib-2.2.4.tar.gz) = c4ceb75314c303d310410683180dbe950223c7f054fc19739c49eaede46f183075ea402e7305843552fae75af3c55560f9e5c5549994cf5fce34f07ad6f3c720
+SHA512 (matplotlib-2.2.3-with-freetype-2.9.1.tar.gz) = 00f6d4eeab6d73108129a5ccbaccda37c2e8cc684efeeb03c492a96a2071357a32a624ebfef2770c8c205a3741ef8d947f117351d90d25c4c7b4b8b6b84db556
+SHA512 (matplotlib-2.2.3-with-freetype-2.8.tar.gz) = 7f11a0589f2ab5fcbdee0da0d4fa003c62b9e882fbae22a6bc725f791f3ea058b33321a70a5cf1858f494aa1ebb8b3e686c56ff73e6174fb980e159331bd0a0d