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

@@ -4,3 +4,26 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-1.2.0-without-gpc.tar.gz
 /matplotlib-1.3.0-without-gpc.tar.xz
 /matplotlib-1.3.1-without-gpc.tar.xz
+/matplotlib-1.4.3-without-gpc.tar.xz
+/matplotlib-1.4.3-without-extern.tar.xz
+/matplotlib-1.5.1-without-extern.tar.xz
+/matplotlib-1.5.1.tar.gz
+/matplotlib-1.5.2rc2.tar.gz
+/matplotlib-2.0.0b4.tar.gz
+/matplotlib-2.0.0rc2.tar.gz
+/matplotlib-2.0.0.tar.gz
+/matplotlib-2.0.0-without-copyrighted.tar.xz
+/matplotlib-2.0.1.tar.gz
+/matplotlib-2.0.2.tar.gz
+/matplotlib-2.1.0rc1.tar.gz
+/matplotlib-2.1.0.tar.gz
+/matplotlib-2.1.1.tar.gz
+/matplotlib-2.1.2.tar.gz
+/matplotlib-2.1.2-with-freetype-2.8.tar.gz
+/matplotlib-2.2.2.tar.gz
+/matplotlib-2.2.2-with-freetype-2.8.tar.gz
+/matplotlib-2.2.2-with-freetype-2.9.tar.gz
+/matplotlib-2.2.3.tar.gz
+/matplotlib-2.2.3-with-freetype-2.8.tar.gz
+/matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
+/matplotlib-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,29 +0,0 @@
-Description: Fixes the path to search for matplotlibrc file
-Forwarded: not-needed
-Author: Sandro Tosi <morph@debian.org>
-
---- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -607,10 +607,12 @@ def _get_data_path():
-             raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
-         return path
- 
--    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
-@@ -727,7 +729,7 @@ def matplotlib_fname():
-                     _get_xdg_config_dir())
-             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')

40_bts608939_draw_markers_description.patch

@@ -1,14 +0,0 @@
-Description: minor glitch in draw_markers() description
-Author: Jakub Wilk <jwilk@debian.org>
-
---- a/doc/api/api_changes.rst
-+++ b/doc/api/api_changes.rst
-@@ -919,7 +919,7 @@ New methods:
- 
-   * :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
-     trans, rgbFace)
--    <matplotlib.backend_bases.RendererBase.draw_markers`
-+    <matplotlib.backend_bases.RendererBase.draw_markers>`
- 
-   * :meth:`draw_path_collection(self, master_transform, cliprect,
-     clippath, clippath_trans, paths, all_transforms, offsets,

50_bts608942_spaces_in_param_args.patch

@@ -1,49 +0,0 @@
-Description: don't separate param and its argument with a space
-
---- a/lib/mpl_toolkits/axes_grid1/axes_divider.py
-+++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py
-@@ -201,12 +201,12 @@ class Divider(object):
-     def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
-         """
- 
--        :param nx, nx1: Integers specifying the column-position of the
-+        :param nx,nx1: Integers specifying the column-position of the
-           cell. When nx1 is None, a single nx-th column is
-           specified. Otherwise location of columns spanning between nx
-           to nx1 (but excluding nx1-th column) is specified.
- 
--        :param ny, ny1: same as nx and nx1, but for row positions.
-+        :param ny,ny1: same as nx and nx1, but for row positions.
-         """
- 
- 
-@@ -253,12 +253,12 @@ class Divider(object):
-         (:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
-         specified cell.
- 
--        :param nx, nx1: Integers specifying the column-position of the
-+        :param nx,nx1: Integers specifying the column-position of the
-           cell. When nx1 is None, a single nx-th column is
-           specified. Otherwise location of columns spanning between nx
-           to nx1 (but excluding nx1-th column) is specified.
- 
--        :param ny, ny1: same as nx and nx1, but for row positions.
-+        :param ny,ny1: same as nx and nx1, but for row positions.
-         """
-         return AxesLocator(self, nx, ny, nx1, ny1)
- 
-@@ -299,12 +299,12 @@ class AxesLocator(object):
-         """
-         :param axes_divider: An instance of AxesDivider class.
- 
--        :param nx, nx1: Integers specifying the column-position of the
-+        :param nx,nx1: Integers specifying the column-position of the
-           cell. When nx1 is None, a single nx-th column is
-           specified. Otherwise location of columns spanning between nx
-           to nx1 (but excluding nx1-th column) is is specified.
- 
--        :param ny, ny1: same as nx and nx1, but for row positions.
-+        :param ny,ny1: same as nx and nx1, but for row positions.
-         """
-         self._axes_divider = axes_divider
- 

60_deal_with_no_writable_dirs.patch

@@ -1,111 +0,0 @@
-Description: deal with the case where there are no writable directories.
-Author: Michael Droettboom <mdboom@gmail.com>
-Bug-Debian: http://bugs.debian.org/719384
-Origin: https://github.com/mdboom/matplotlib/commit/1e8d592ed0439ac6fe8fc08d5efe522799acf4fe
-Reviewed-By: Anton Gladky <gladk@debian.org>
-Last-Update: 2013-09-29
-
---- matplotlib-1.3.0.orig/lib/matplotlib/font_manager.py
-+++ matplotlib-1.3.0/lib/matplotlib/font_manager.py
-@@ -1324,6 +1324,8 @@ if USE_FONTCONFIG and sys.platform != 'w
-         return result
- 
- else:
-+    _fmcache = None
-+
-     if not 'TRAVIS' in os.environ:
-         cachedir = get_cachedir()
-         if cachedir is not None:
-@@ -1331,8 +1333,6 @@ else:
-                 _fmcache = os.path.join(cachedir, 'fontList.py3k.cache')
-             else:
-                 _fmcache = os.path.join(cachedir, 'fontList.cache')
--    else:
--        _fmcache = None
- 
-     fontManager = None
- 
---- matplotlib-1.3.0.orig/lib/matplotlib/__init__.py
-+++ matplotlib-1.3.0/lib/matplotlib/__init__.py
-@@ -518,7 +518,11 @@ def _get_xdg_config_dir():
-     base directory spec
-     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
-     """
--    return os.environ.get('XDG_CONFIG_HOME', os.path.join(get_home(), '.config'))
-+    home = get_home()
-+    if home is None:
-+        return None
-+    else:
-+        return os.environ.get('XDG_CONFIG_HOME', os.path.join(home, '.config'))
- 
- 
- def _get_xdg_cache_dir():
-@@ -527,7 +531,11 @@ def _get_xdg_cache_dir():
-     base directory spec
-     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
-     """
--    return os.environ.get('XDG_CACHE_HOME', os.path.join(get_home(), '.cache'))
-+    home = get_home()
-+    if home is None:
-+        return None
-+    else:
-+        return os.environ.get('XDG_CACHE_HOME', os.path.join(home, '.cache'))
- 
- 
- def _get_config_or_cache_dir(xdg_base):
-@@ -543,22 +551,28 @@ def _get_config_or_cache_dir(xdg_base):
-             return _create_tmp_config_dir()
-         return configdir
- 
-+    p = None
-     h = get_home()
--    p = os.path.join(h, '.matplotlib')
--    if (sys.platform.startswith('linux') and
--        not os.path.exists(p)):
--        p = os.path.join(xdg_base, 'matplotlib')
--
--    if os.path.exists(p):
--        if not _is_writable_dir(p):
--            return _create_tmp_config_dir()
--    else:
--        try:
--            mkdirs(p)
--        except OSError:
--            return _create_tmp_config_dir()
-+    if h is not None:
-+        p = os.path.join(h, '.matplotlib')
-+        if (sys.platform.startswith('linux') and
-+            not os.path.exists(p) and
-+            xdg_base is not None):
-+            p = os.path.join(xdg_base, 'matplotlib')
-+
-+    if p is not None:
-+        if os.path.exists(p):
-+            if _is_writable_dir(p):
-+                return p
-+        else:
-+            try:
-+                mkdirs(p)
-+            except OSError:
-+                pass
-+            else:
-+                return p
- 
--    return p
-+    return _create_tmp_config_dir()
- 
- 
- def _get_configdir():
-@@ -716,9 +730,11 @@ def matplotlib_fname():
-     if configdir is not None:
-         fname = os.path.join(configdir, 'matplotlibrc')
-         if os.path.exists(fname):
-+            home = get_home()
-             if (sys.platform.startswith('linux') and
-+                home is not None and
-                 fname == os.path.join(
--                    get_home(), '.matplotlib', 'matplotlibrc')):
-+                    home, '.matplotlib', 'matplotlibrc')):
-                 warnings.warn(
-                     "Found matplotlib configuration in ~/.matplotlib/. "
-                     "To conform with the XDG base directory standard, "

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
-@@ -289,7 +289,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'] = [

generate-tarball.sh

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

python-matplotlib-noagg.patch

@@ -1,26 +0,0 @@
---- setupext.py.orig	2013-08-02 09:39:43.914247832 +0200
-+++ setupext.py	2013-08-02 09:40:14.785304342 +0200
-@@ -749,22 +749,7 @@
-             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('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('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-system-cxx.patch

@@ -1,15 +0,0 @@
---- setupext.py.orig	2014-01-25 15:06:39.460916454 +0100
-+++ setupext.py	2014-01-25 15:06:53.080946205 +0100
-@@ -768,12 +768,6 @@
-     name = 'pycxx'
- 
-     def check(self):
--        if sys.version_info[0] >= 3:
--            # There is no version of PyCXX in the wild that will work
--            # with Python 3.x
--            self.__class__.found_external = False
--            return ("Official versions of PyCXX are not compatible with "
--                    "Python 3.x.  Using local copy")
- 
-         self.__class__.found_external = True
-         old_stdout = sys.stdout

setup.cfg

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

sources

@@ -1 +1,3 @@
-832170ea532d5f7ca227ea04f044291e  matplotlib-1.3.1-without-gpc.tar.xz
+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