Restore missing sources.

Update to 2.2.4.
2019-03-17 22:58:10 -04:00 · 2019-03-09 23:59:00 -05:00
15 changed files with 831 additions and 973 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -26,20 +26,4 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-2.2.3.tar.gz
 /matplotlib-2.2.3-with-freetype-2.8.tar.gz
 /matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0rc1.tar.gz
-/matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0rc2.tar.gz
-/matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0.tar.gz
-/matplotlib-3.0.0-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.1.tar.gz
-/matplotlib-3.0.1-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.2.tar.gz
-/matplotlib-3.0.3.tar.gz
-/matplotlib-3.1.0rc1.tar.gz
-/matplotlib-3.1.0.tar.gz
-/matplotlib-3.1.0-with-freetype-2.10.0.tar.gz
-/matplotlib-3.1.1.tar.gz
-/matplotlib-3.1.1-with-freetype-2.10.0.tar.gz
-/matplotlib-3.1.2.tar.gz
-/matplotlib-3.1.3.tar.gz
+/matplotlib-2.2.4.tar.gz
--- a/0001-Fix-env-override-in-WebAgg-backend-test.patch
+++ b/0001-Fix-env-override-in-WebAgg-backend-test.patch
@@ -1,36 +0,0 @@
-From f0dbd8d7b76ac217df3641d03997b393c476d77c Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Wed, 20 Nov 2019 15:58:04 -0500
-Subject: [PATCH] Fix env override in WebAgg backend test.
-
-It's only necessary to override DISPLAY, not throw away the rest of the
-environment. Without the other environment variables, stuff like custom
-PYTHONPATH break in this test.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
- lib/matplotlib/tests/test_backend_webagg.py | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_backend_webagg.py b/lib/matplotlib/tests/test_backend_webagg.py
-index 220670aa4..997c36a3a 100644
--- a/lib/matplotlib/tests/test_backend_webagg.py
-+++ b/lib/matplotlib/tests/test_backend_webagg.py
-@@ -8,11 +8,9 @@ import pytest
- def test_webagg_fallback(backend):
-     if backend == "nbagg":
-         pytest.importorskip("IPython")
-    env = {}
-    if os.name == "nt":
-        env = dict(os.environ)
-    else:
-        env = {"DISPLAY": ""}
-+    env = dict(os.environ)
-+    if os.name != "nt":
-+        env["DISPLAY"] = ""
- 
-     env["MPLBACKEND"] = backend
- 
-- 
-2.21.0
-
--- a/0001-Force-using-system-qhull.patch
+++ b/0001-Force-using-system-qhull.patch
@@ -1,37 +1,43 @@
-From ee5c28ea8cd17cbc04d5a9b79d5ce1326df93466 Mon Sep 17 00:00:00 2001
+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 | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
+ setupext.py | 17 ++---------------
+ 1 file changed, 2 insertions(+), 15 deletions(-)

 diff --git a/setupext.py b/setupext.py
-index 3e8b382cc..66a278b0c 100644
+index d2ff239ad..30e0c9085 100644
 --- a/setupext.py
 +++ b/setupext.py
-@@ -838,14 +838,12 @@ class Png(SetupPackage):
- class Qhull(SetupPackage):
-     name = "qhull"
+@@ -1318,23 +1318,10 @@ class Qhull(SetupPackage):
 
-+    def check(self):
-+        self.__class__.found_external = True
+     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):
-        # Qhull doesn't distribute pkg-config info, so we have no way of
-        # knowing whether a system install is recent enough.  Thus, always use
-        # the vendored version.
-        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')
+-        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.21.0
+2.14.3

--- a/0001-Skip-webagg-test-if-tornado-is-not-available.patch
+++ b/0001-Skip-webagg-test-if-tornado-is-not-available.patch
@@ -1,25 +0,0 @@
-From 5c714fede82e29bd42a3a6f20ec2898a9c37a0ed Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Fri, 22 Nov 2019 19:50:20 -0500
-Subject: [PATCH] Skip webagg test if tornado is not available.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
- lib/matplotlib/tests/test_backend_webagg.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/matplotlib/tests/test_backend_webagg.py b/lib/matplotlib/tests/test_backend_webagg.py
-index 997c36a3a..5c6ddfa25 100644
--- a/lib/matplotlib/tests/test_backend_webagg.py
-+++ b/lib/matplotlib/tests/test_backend_webagg.py
-@@ -6,6 +6,7 @@ import pytest
- 
- @pytest.mark.parametrize("backend", ["webagg", "nbagg"])
- def test_webagg_fallback(backend):
-+    pytest.importorskip("tornado")
-     if backend == "nbagg":
-         pytest.importorskip("IPython")
-     env = dict(os.environ)
-- 
-2.21.0
-
--- a/0001-Use-packaged-jquery-and-jquery-ui.patch
+++ b/0001-Use-packaged-jquery-and-jquery-ui.patch
@@ -1,14 +1,14 @@
-From c2af74bf18d46d03ec34bfda32afe1a99511ac9f Mon Sep 17 00:00:00 2001
+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                                      | 56 -------------------
- 3 files changed, 6 insertions(+), 62 deletions(-)
+ .../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
@@ -45,39 +45,29 @@ index 4d5a366fb..c11c86618 100644
     <script src="{{ prefix }}/js/mpl.js"></script>
     <script>
 diff --git a/setup.py b/setup.py
-index adabf1753..57d6b91b4 100644
+index 41037e95d..7a0af717f 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -27,8 +27,6 @@ from zipfile import ZipFile
+@@ -35,8 +35,6 @@ from zipfile import ZipFile
 
- from setuptools import setup, Extension
+ 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.
-@@ -124,60 +122,6 @@ cmdclass['test'] = NoopTestCommand
+@@ -146,53 +144,6 @@ cmdclass['test'] = NoopTestCommand
 cmdclass['build_ext'] = BuildExtraLibraries
 
 
 -def _download_jquery_to(dest):
-    if os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
-        return
-
-    # If we are installing from an sdist, use the already downloaded jquery-ui
-    sdist_src = os.path.join(
-        "lib/matplotlib/backends/web_backend", "jquery-ui-1.12.1")
-    if os.path.exists(sdist_src):
-        shutil.copytree(sdist_src, os.path.join(dest, "jquery-ui-1.12.1"))
-        return
-
 -    # 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")):
-        os.makedirs(dest, exist_ok=True)
+-        _makedirs(dest, exist_ok=True)
 -        try:
 -            buff = download_or_cache(url, sha)
 -        except Exception:
@@ -89,9 +79,12 @@ index adabf1753..57d6b91b4 100644
 -
 -
 -# Relying on versioneer's implementation detail.
-class sdist_with_jquery(cmdclass['sdist']):
+-_orgin_sdist = cmdclass['sdist']
+-
+-
+-class sdist_with_jquery(_orgin_sdist):
 -    def make_release_tree(self, base_dir, files):
-        super(sdist_with_jquery, self).make_release_tree(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/"))
 -
@@ -99,14 +92,14 @@ index adabf1753..57d6b91b4 100644
 -# Affects install and bdist_wheel.
 -class install_lib_with_jquery(InstallLibCommand):
 -    def run(self):
-        super(install_lib_with_jquery, self).run()
+-        InstallLibCommand.run(self)
 -        _download_jquery_to(
 -            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
 -
 -
 -class develop_with_jquery(DevelopCommand):
 -    def run(self):
-        super(develop_with_jquery, self).run()
+-        DevelopCommand.run(self)
 -        _download_jquery_to("lib/matplotlib/backends/web_backend/")
 -
 -
@@ -119,5 +112,5 @@ index adabf1753..57d6b91b4 100644
 # however, this is needed on Windows to avoid creating infinite subprocesses
 # when using multiprocessing.
 -- 
-2.21.0
+2.20.1

--- a/0001-matplotlibrc-path-search-fix.patch
+++ b/0001-matplotlibrc-path-search-fix.patch
@@ -1,92 +1,84 @@
-From 9776757607af144c824d72920f8983efc35face3 Mon Sep 17 00:00:00 2001
+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/4] matplotlibrc path search fix
+Subject: [PATCH 1/3] matplotlibrc path search fix

 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- lib/matplotlib/__init__.py            | 19 ++++---------------
- lib/matplotlib/tests/test_rcparams.py | 18 ++++++++++++------
- 2 files changed, 16 insertions(+), 21 deletions(-)
+ 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 825303171..7a4115491 100644
+index c5accc3c3..bc38f316c 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -624,18 +624,8 @@ def _get_data_path():
+@@ -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
 
-     def get_candidate_paths():
-        yield Path(__file__).with_name('mpl-data')
-        # setuptools' namespace_packages may hijack this init file
-        # so need to try something known to be in Matplotlib, not basemap.
-        import matplotlib.afm
-        yield Path(matplotlib.afm.__file__).with_name('mpl-data')
-        # py2exe zips pure python, so still need special check.
-        if getattr(sys, 'frozen', None):
-            yield Path(sys.executable).with_name('mpl-data')
-            # Try again assuming we need to step up one more directory.
-            yield Path(sys.executable).parent.with_name('mpl-data')
-            # Try again assuming sys.path[0] is a dir not a exe.
-            yield Path(sys.path[0]) / 'mpl-data'
-+        yield (Path(__file__).parent.parent.parent.parent.parent /
-+               'share/matplotlib/mpl-data')
+    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():
 
-     for path in get_candidate_paths():
-         if path.is_dir():
-@@ -678,8 +668,7 @@ def matplotlib_fname():
-           is not defined)
-     - On other platforms,
-         - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
-    - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
-      exist.
-+    - Lastly, it looks in ``/etc/matplotlibrc``, which should always exist.
+          - `$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():
-@@ -692,7 +681,7 @@ def matplotlib_fname():
+@@ -835,7 +837,7 @@ def matplotlib_fname():
             yield matplotlibrc
             yield os.path.join(matplotlibrc, 'matplotlibrc')
-         yield os.path.join(get_configdir(), 'matplotlibrc')
+         yield os.path.join(_get_configdir(), 'matplotlibrc')
 -        yield os.path.join(get_data_path(), 'matplotlibrc')
 +        yield '/etc/matplotlibrc'
 
     for fname in gen_candidates():
-         if os.path.exists(fname) and not os.path.isdir(fname):
+         if os.path.exists(fname):
 diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
-index d8fe73ceb..c3aeb58ef 100644
+index c0378e1bf..7f14bcc46 100644
 --- a/lib/matplotlib/tests/test_rcparams.py
 +++ b/lib/matplotlib/tests/test_rcparams.py
-@@ -1,6 +1,7 @@
- from collections import OrderedDict
- import copy
- import os
-+from pathlib import Path
- from unittest import mock
- import warnings
- 
-@@ -457,11 +458,17 @@ def test_rcparams_reset_after_fail():
+@@ -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.
-+    return (Path(__file__).parent.parent.parent.parent.parent.parent.parent /
-+            'etc/matplotlibrc')
+    # This is the Fedora-specific location ...
+    if 'MATPLOTLIBDATA' in os.environ:
+        # ... in buildroot.
+        return os.path.join(os.environ['MATPLOTLIBDATA'],
+                            '../../../../etc/matplotlibrc')
+    else:
+        # ... on installed systems.
+        return '/etc/matplotlibrc'
 +
 +
 +def test_if_rctemplate_is_up_to_date(mplrc):
-     # This tests if the matplotlibrc.template file contains all valid rcParams.
-     deprecated = {*mpl._all_deprecated, *mpl._deprecated_remain_as_none}
+     # 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():
-@@ -484,11 +491,10 @@ def test_if_rctemplate_is_up_to_date():
+@@ -453,11 +464,10 @@ def test_if_rctemplate_is_up_to_date():
                          .format(missing.items()))
 
 
@@ -101,5 +93,5 @@ index d8fe73ceb..c3aeb58ef 100644
     newlines = []
     for line in rclines:
 -- 
-2.21.1
+2.20.1

--- a/0002-Increase-tolerances-for-non-x86_64-arches.patch
+++ b/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
+
--- a/0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch
+++ b/0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch
@@ -1,114 +0,0 @@
-From 939fcad1ab9dc4986bd86842f616dc50cb6398e2 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sat, 4 May 2019 04:36:45 -0400
-Subject: [PATCH 2/4] Set FreeType version to 2.10.0 and update tolerances.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
- lib/matplotlib/__init__.py                     |  2 +-
- lib/matplotlib/tests/test_axes.py              |  6 +++---
- lib/matplotlib/tests/test_constrainedlayout.py |  2 +-
- lib/matplotlib/tests/test_tightlayout.py       | 10 +++++-----
- setupext.py                                    |  5 ++++-
- 5 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 7a4115491..1bf9d3e03 100644
--- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -1361,7 +1361,7 @@ def _init_tests():
- 
-     # The version of FreeType to install locally for running the
-     # tests.  This must match the value in `setupext.py`
-    LOCAL_FREETYPE_VERSION = '2.6.1'
-+    LOCAL_FREETYPE_VERSION = '2.10.0'
- 
-     from matplotlib import ft2font
-     if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 356b9ad42..84a1956ee 100644
--- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -6207,7 +6207,7 @@ def test_normal_axes():
-     ]
-     for nn, b in enumerate(bbaxis):
-         targetbb = mtransforms.Bbox.from_bounds(*target[nn])
-        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2)
-+        assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0)
- 
-     target = [
-         [150.0, 119.999, 930.0, 11.111],
-@@ -6225,7 +6225,7 @@ def test_normal_axes():
- 
-     target = [85.5138, 75.88888, 1021.11, 1017.11]
-     targetbb = mtransforms.Bbox.from_bounds(*target)
-    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2)
-+    assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0)
- 
-     # test that get_position roundtrips to get_window_extent
-     axbb = ax.get_position().transformed(fig.transFigure).bounds
-@@ -6350,7 +6350,7 @@ def test_get_tightbbox_polar():
-     fig.canvas.draw()
-     bb = ax.get_tightbbox(fig.canvas.get_renderer())
-     assert_allclose(bb.extents,
-        [107.7778,  29.2778, 539.7847, 450.7222], rtol=1e-03)
-+        [107.7778,  29.2778, 539.7847, 450.7222], rtol=1)
- 
- 
- @check_figures_equal(extensions=["png"])
-diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index 8769fcec3..e9ae292f6 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -416,4 +416,4 @@ def test_hidden_axes():
-     extents1 = np.copy(axs[0, 0].get_position().extents)
- 
-     np.testing.assert_allclose(extents1,
-        [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-5)
-+        [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-2)
-diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
-index 0b9469cb8..7963b82ff 100644
--- a/lib/matplotlib/tests/test_tightlayout.py
-+++ b/lib/matplotlib/tests/test_tightlayout.py
-@@ -186,12 +186,12 @@ def test_outward_ticks():
-     plt.tight_layout()
-     # These values were obtained after visual checking that they correspond
-     # to a tight layouting that did take the ticks into account.
-    ans = [[[0.091, 0.607], [0.433, 0.933]],
-           [[0.579, 0.607], [0.922, 0.933]],
-           [[0.091, 0.140], [0.433, 0.466]],
-           [[0.579, 0.140], [0.922, 0.466]]]
-+    ans = [[[0.09, 0.61], [0.43, 0.93]],
-+           [[0.58, 0.61], [0.92, 0.93]],
-+           [[0.09, 0.14], [0.43, 0.47]],
-+           [[0.58, 0.14], [0.92, 0.47]]]
-     for nn, ax in enumerate(fig.axes):
-        assert_array_equal(np.round(ax.get_position().get_points(), 3),
-+        assert_array_equal(np.round(ax.get_position().get_points(), 2),
-                            ans[nn])
- 
- 
-diff --git a/setupext.py b/setupext.py
-index 3e8b382cc..2a3fc3ee7 100644
--- a/setupext.py
-+++ b/setupext.py
-@@ -135,12 +135,15 @@ _freetype_hashes = {
-     '2.7.1': '162ef25aa64480b1189cdb261228e6c5c44f212aac4b4621e28cf2157efb59f5',
-     '2.8': '33a28fabac471891d0523033e99c0005b95e5618dc8ffa7fa47f9dadcacb1c9b',
-     '2.8.1': '876711d064a6a1bd74beb18dd37f219af26100f72daaebd2d86cb493d7cd7ec6',
-+    '2.9': 'bf380e4d7c4f3b5b1c1a7b2bf3abb967bda5e9ab480d0df656e0e08c5019c5e6',
-+    '2.9.1': 'ec391504e55498adceb30baceebd147a6e963f636eb617424bcfc47a169898ce',
-+    '2.10.0': '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a',
- }
- # This is the version of FreeType to use when building a local
- # version.  It must match the value in
- # lib/matplotlib.__init__.py and also needs to be changed below in the
- # embedded windows build script (grep for "REMINDER" in this file)
-LOCAL_FREETYPE_VERSION = '2.6.1'
-+LOCAL_FREETYPE_VERSION = '2.10.0'
- LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
- 
- 
-- 
-2.21.1
-
--- a/0003-Increase-some-tolerances-for-32-bit-systems.patch
+++ b/0003-Increase-some-tolerances-for-32-bit-systems.patch
@@ -1,39 +1,35 @@
-From d9fada8cc0ef89142222f4c163ec9dd155662cb6 Mon Sep 17 00:00:00 2001
+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 4/4] Increase some tolerances for 32-bit systems.
+Subject: [PATCH 3/3] Increase some tolerances for 32-bit systems.

 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 lib/matplotlib/testing/decorators.py          |  2 +-
 lib/matplotlib/tests/test_artist.py           |  3 +-
- lib/matplotlib/tests/test_axes.py             | 49 ++++++++++---------
+ lib/matplotlib/tests/test_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          |  8 +--
- lib/matplotlib/tests/test_cycles.py           |  3 --
- lib/matplotlib/tests/test_figure.py           |  3 +-
+ lib/matplotlib/tests/test_contour.py          |  6 +--
 lib/matplotlib/tests/test_image.py            |  2 +-
- lib/matplotlib/tests/test_legend.py           |  5 +-
 lib/matplotlib/tests/test_mathtext.py         |  4 +-
 lib/matplotlib/tests/test_patches.py          |  3 +-
 lib/matplotlib/tests/test_patheffects.py      |  2 +-
 lib/matplotlib/tests/test_pickle.py           |  2 +-
 lib/matplotlib/tests/test_quiver.py           |  2 +-
- lib/matplotlib/tests/test_streamplot.py       |  2 +-
+ lib/matplotlib/tests/test_streamplot.py       |  3 +-
 lib/matplotlib/tests/test_transforms.py       |  2 +-
- lib/matplotlib/tests/test_units.py            |  1 -
 .../tests/test_axisartist_floating_axes.py    |  4 +-
 ...test_axisartist_grid_helper_curvelinear.py |  6 +--
 lib/mpl_toolkits/tests/test_mplot3d.py        |  4 +-
- 22 files changed, 59 insertions(+), 63 deletions(-)
+ 18 files changed, 53 insertions(+), 54 deletions(-)

 diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
-index 04d5bcda8..70de0263b 100644
+index d008446dc..2d930cacc 100644
 --- a/lib/matplotlib/testing/decorators.py
 +++ b/lib/matplotlib/testing/decorators.py
-@@ -341,7 +341,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol,
+@@ -418,7 +418,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol,
     return decorator
 
 
@@ -43,10 +39,10 @@ index 04d5bcda8..70de0263b 100644
                      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 9bf15d0b9..5339dd2eb 100644
+index e6aff72bf..b60305bcf 100644
 --- a/lib/matplotlib/tests/test_artist.py
 +++ b/lib/matplotlib/tests/test_artist.py
-@@ -94,7 +94,8 @@ def test_collection_transform_of_none():
+@@ -96,7 +96,8 @@ def test_collection_transform_of_none():
     assert isinstance(c._transOffset, mtransforms.IdentityTransform)
 
 
@@ -57,19 +53,29 @@ index 9bf15d0b9..5339dd2eb 100644
     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 84a1956ee..50eb0e6a4 100644
+index dde856669..5cfd4151a 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
-@@ -562,7 +562,7 @@ def test_single_point():
+@@ -555,7 +555,7 @@ def test_single_point():
+     plt.plot('b', 'b', 'o', data=data)
 
 
- @image_comparison(baseline_images=['single_date'], extensions=['png'],
-        style='mpl20')
-+        style='mpl20', tol=1.97)
+-@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]
-@@ -1079,7 +1079,7 @@ def test_fill_between_interpolate():
+@@ -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'],
@@ -78,27 +84,25 @@ index 84a1956ee..50eb0e6a4 100644
 def test_fill_between_interpolate_decreasing():
     p = np.array([724.3, 700, 655])
     t = np.array([9.4, 7, 2.2])
-@@ -1164,7 +1164,8 @@ def test_pcolormesh():
+@@ -1105,7 +1104,7 @@ def test_pcolormesh():
 
 
 @image_comparison(baseline_images=['pcolormesh_datetime_axis'],
-                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.19)
+-                  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)
-@@ -1190,7 +1191,8 @@ def test_pcolormesh_datetime_axis():
+@@ -1131,7 +1130,7 @@ def test_pcolormesh_datetime_axis():
 
 
 @image_comparison(baseline_images=['pcolor_datetime_axis'],
-                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.19)
+-                  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)
-@@ -1247,7 +1249,7 @@ def test_canonical():
+@@ -1188,7 +1187,7 @@ def test_canonical():
 
 
 @image_comparison(baseline_images=['arc_angles'], remove_text=True,
@@ -107,7 +111,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_arc_angles():
     from matplotlib import patches
     # Ellipse parameters
-@@ -2644,7 +2646,7 @@ def test_boxplot_mod_artist_after_plotting():
+@@ -2450,7 +2449,7 @@ def test_boxplot_mod_artist_after_plotting():
 
 @image_comparison(baseline_images=['violinplot_vert_baseline',
                                    'violinplot_vert_baseline'],
@@ -116,7 +120,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_vert_violinplot_baseline():
     # First 9 digits of frac(sqrt(2))
     np.random.seed(414213562)
-@@ -2662,7 +2664,7 @@ def test_vert_violinplot_baseline():
+@@ -2468,7 +2467,7 @@ def test_vert_violinplot_baseline():
 
 
 @image_comparison(baseline_images=['violinplot_vert_showmeans'],
@@ -125,7 +129,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_vert_violinplot_showmeans():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(3))
-@@ -2673,7 +2675,7 @@ def test_vert_violinplot_showmeans():
+@@ -2479,7 +2478,7 @@ def test_vert_violinplot_showmeans():
 
 
 @image_comparison(baseline_images=['violinplot_vert_showextrema'],
@@ -134,7 +138,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_vert_violinplot_showextrema():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(5))
-@@ -2684,7 +2686,7 @@ def test_vert_violinplot_showextrema():
+@@ -2490,7 +2489,7 @@ def test_vert_violinplot_showextrema():
 
 
 @image_comparison(baseline_images=['violinplot_vert_showmedians'],
@@ -143,7 +147,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_vert_violinplot_showmedians():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(7))
-@@ -2695,7 +2697,7 @@ def test_vert_violinplot_showmedians():
+@@ -2501,7 +2500,7 @@ def test_vert_violinplot_showmedians():
 
 
 @image_comparison(baseline_images=['violinplot_vert_showall'],
@@ -152,7 +156,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_vert_violinplot_showall():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(11))
-@@ -2706,7 +2708,7 @@ def test_vert_violinplot_showall():
+@@ -2512,7 +2511,7 @@ def test_vert_violinplot_showall():
 
 
 @image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
@@ -161,7 +165,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_vert_violinplot_custompoints_10():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(13))
-@@ -2717,7 +2719,7 @@ def test_vert_violinplot_custompoints_10():
+@@ -2523,7 +2522,7 @@ def test_vert_violinplot_custompoints_10():
 
 
 @image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
@@ -170,7 +174,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_vert_violinplot_custompoints_200():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(17))
-@@ -2728,7 +2730,7 @@ def test_vert_violinplot_custompoints_200():
+@@ -2534,7 +2533,7 @@ def test_vert_violinplot_custompoints_200():
 
 
 @image_comparison(baseline_images=['violinplot_horiz_baseline'],
@@ -179,7 +183,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_horiz_violinplot_baseline():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(19))
-@@ -2739,7 +2741,7 @@ def test_horiz_violinplot_baseline():
+@@ -2545,7 +2544,7 @@ def test_horiz_violinplot_baseline():
 
 
 @image_comparison(baseline_images=['violinplot_horiz_showmedians'],
@@ -188,7 +192,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_horiz_violinplot_showmedians():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(23))
-@@ -2750,7 +2752,7 @@ def test_horiz_violinplot_showmedians():
+@@ -2556,7 +2555,7 @@ def test_horiz_violinplot_showmedians():
 
 
 @image_comparison(baseline_images=['violinplot_horiz_showmeans'],
@@ -197,7 +201,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_horiz_violinplot_showmeans():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(29))
-@@ -2761,7 +2763,7 @@ def test_horiz_violinplot_showmeans():
+@@ -2567,7 +2566,7 @@ def test_horiz_violinplot_showmeans():
 
 
 @image_comparison(baseline_images=['violinplot_horiz_showextrema'],
@@ -206,7 +210,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_horiz_violinplot_showextrema():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(31))
-@@ -2772,7 +2774,7 @@ def test_horiz_violinplot_showextrema():
+@@ -2578,7 +2577,7 @@ def test_horiz_violinplot_showextrema():
 
 
 @image_comparison(baseline_images=['violinplot_horiz_showall'],
@@ -215,7 +219,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_horiz_violinplot_showall():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(37))
-@@ -2783,7 +2785,7 @@ def test_horiz_violinplot_showall():
+@@ -2589,7 +2588,7 @@ def test_horiz_violinplot_showall():
 
 
 @image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
@@ -224,7 +228,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_horiz_violinplot_custompoints_10():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(41))
-@@ -2794,7 +2796,7 @@ def test_horiz_violinplot_custompoints_10():
+@@ -2600,7 +2599,7 @@ def test_horiz_violinplot_custompoints_10():
 
 
 @image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
@@ -233,17 +237,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_horiz_violinplot_custompoints_200():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(43))
-@@ -3518,8 +3520,7 @@ def test_vertex_markers():
- 
- 
- @image_comparison(baseline_images=['vline_hline_zorder',
-                                   'errorbar_zorder'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                                   'errorbar_zorder'])
- def test_eb_line_zorder():
-     x = list(range(10))
- 
-@@ -4199,7 +4200,7 @@ def test_psd_noise():
+@@ -3944,7 +3943,7 @@ def test_psd_noise():
 
 
 @image_comparison(baseline_images=['csd_freqs'], remove_text=True,
@@ -252,7 +246,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_csd_freqs():
     '''test axes.csd with sinusoidal stimuli'''
     n = 10000
-@@ -5117,7 +5118,7 @@ def test_rc_spines():
+@@ -4803,7 +4802,7 @@ def test_rc_spines():
 
 
 @image_comparison(baseline_images=['rc_grid'], extensions=['png'],
@@ -261,7 +255,7 @@ index 84a1956ee..50eb0e6a4 100644
 def test_rc_grid():
     fig = plt.figure()
     rc_dict0 = {
-@@ -5679,7 +5680,7 @@ def test_date_timezone_y():
+@@ -5298,7 +5297,7 @@ def test_date_timezone_y():
 
 
 @image_comparison(baseline_images=['date_timezone_x_and_y'],
@@ -269,12 +263,12 @@ index 84a1956ee..50eb0e6a4 100644
 +                  extensions=['png'], tol=3.05)
 def test_date_timezone_x_and_y():
     # Tests issue 5575
-     UTC = datetime.timezone.utc
+     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 773093100..37356d5e0 100644
+index 291647d17..265f23fed 100644
 --- a/lib/matplotlib/tests/test_collections.py
 +++ b/lib/matplotlib/tests/test_collections.py
-@@ -466,7 +466,7 @@ def test_EllipseCollection():
+@@ -467,7 +467,7 @@ def test_EllipseCollection():
 
 
 @image_comparison(baseline_images=['polycollection_close'],
@@ -284,10 +278,10 @@ index 773093100..37356d5e0 100644
     from mpl_toolkits.mplot3d import Axes3D
 
 diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
-index c65ad02c3..79deb249c 100644
+index 12a9bed3b..86d2358fb 100644
 --- a/lib/matplotlib/tests/test_colorbar.py
 +++ b/lib/matplotlib/tests/test_colorbar.py
-@@ -97,7 +97,7 @@ def _colorbar_extension_length(spacing):
+@@ -95,7 +95,7 @@ def _colorbar_extension_length(spacing):
 @image_comparison(
         baseline_images=['colorbar_extensions_shape_uniform',
                          'colorbar_extensions_shape_proportional'],
@@ -296,7 +290,7 @@ index c65ad02c3..79deb249c 100644
 def test_colorbar_extension_shape():
     '''Test rectangular colorbar extensions.'''
     # Create figures for uniform and proportionally spaced colorbars.
-@@ -107,7 +107,7 @@ def test_colorbar_extension_shape():
+@@ -105,7 +105,7 @@ def test_colorbar_extension_shape():
 
 @image_comparison(baseline_images=['colorbar_extensions_uniform',
                                    'colorbar_extensions_proportional'],
@@ -305,7 +299,7 @@ index c65ad02c3..79deb249c 100644
 def test_colorbar_extension_length():
     '''Test variable length colorbar extensions.'''
     # Create figures for uniform and proportionally spaced colorbars.
-@@ -121,7 +121,7 @@ def test_colorbar_extension_length():
+@@ -119,7 +119,7 @@ def test_colorbar_extension_length():
                                    'cbar_sharing',
                                    ],
                   extensions=['png'], remove_text=True,
@@ -314,7 +308,7 @@ index c65ad02c3..79deb249c 100644
 def test_colorbar_positioning():
     data = np.arange(1200).reshape(30, 40)
     levels = [0, 200, 400, 600, 800, 1000, 1200]
-@@ -175,7 +175,7 @@ def test_colorbar_positioning():
+@@ -173,7 +173,7 @@ def test_colorbar_positioning():
 
 @image_comparison(baseline_images=['cbar_with_subplots_adjust'],
                   extensions=['png'], remove_text=True,
@@ -323,7 +317,7 @@ index c65ad02c3..79deb249c 100644
 def test_gridspec_make_colorbar():
     plt.figure()
     data = np.arange(1200).reshape(30, 40)
-@@ -233,7 +233,8 @@ def test_colorbarbase():
+@@ -232,7 +232,8 @@ def test_colorbarbase():
 
 @image_comparison(
     baseline_images=['colorbar_closed_patch'],
@@ -334,10 +328,10 @@ index c65ad02c3..79deb249c 100644
     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 e9ae292f6..0edfa1e27 100644
+index fcf633a08..cad431771 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -246,7 +246,7 @@ def test_constrained_layout12():
+@@ -295,7 +295,7 @@ def test_constrained_layout12():
     ax.set_xlabel('x-label')
 
 
@@ -347,30 +341,28 @@ index e9ae292f6..0edfa1e27 100644
 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 d78dcb1ff..ad39426e2 100644
+index 42903ac68..f03a5d0af 100644
 --- a/lib/matplotlib/tests/test_contour.py
 +++ b/lib/matplotlib/tests/test_contour.py
-@@ -226,7 +226,8 @@ def test_given_colors_levels_and_extends():
+@@ -217,7 +217,7 @@ def test_given_colors_levels_and_extends():
 
 
 @image_comparison(baseline_images=['contour_datetime_axis'],
-                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.18)
+-                  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)
-@@ -252,7 +253,8 @@ def test_contour_datetime_axis():
+@@ -243,7 +243,7 @@ def test_contour_datetime_axis():
 
 
 @image_comparison(baseline_images=['contour_test_label_transforms'],
-                  extensions=['png'], remove_text=True, style='mpl20')
-+                  extensions=['png'], remove_text=True, style='mpl20',
-+                  tol=1.38)
+-                  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
-@@ -283,7 +285,7 @@ def test_labels():
+@@ -274,7 +274,7 @@ def test_labels():
 
 @image_comparison(baseline_images=['contour_corner_mask_False',
                                    'contour_corner_mask_True'],
@@ -379,93 +371,21 @@ index d78dcb1ff..ad39426e2 100644
 def test_corner_mask():
     n = 60
     mask_level = 0.95
-diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
-index 1254f3c7c..de11f6103 100644
--- a/lib/matplotlib/tests/test_cycles.py
-+++ b/lib/matplotlib/tests/test_cycles.py
-@@ -9,7 +9,6 @@ from cycler import cycler
- 
- 
- @image_comparison(baseline_images=['color_cycle_basic'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'])
- def test_colorcycle_basic():
-     fig, ax = plt.subplots()
-@@ -27,7 +26,6 @@ def test_colorcycle_basic():
- 
- 
- @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   remove_text=True, extensions=['png'])
- def test_marker_cycle():
-     fig, ax = plt.subplots()
-@@ -61,7 +59,6 @@ def test_marker_cycle():
- 
- 
- @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'])
- def test_linestylecycle_basic():
-     fig, ax = plt.subplots()
-diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 6ecb3edbe..47aff1b74 100644
--- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -13,8 +13,7 @@ import numpy as np
- import pytest
- 
- 
-@image_comparison(baseline_images=['figure_align_labels'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+@image_comparison(baseline_images=['figure_align_labels'])
- def test_align_labels():
-     # Check the figure.align_labels() command
-     fig = plt.figure(tight_layout=True)
 diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 22cd78d46..b4d41f882 100644
+index c8a23347f..5a23ded19 100644
 --- a/lib/matplotlib/tests/test_image.py
 +++ b/lib/matplotlib/tests/test_image.py
-@@ -810,7 +810,7 @@ def test_imshow_endianess():
+@@ -761,7 +761,7 @@ def test_imshow_endianess():
 
 
 @image_comparison(baseline_images=['imshow_masked_interpolation'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.25,
-                   remove_text=True, style='mpl20')
+-                  remove_text=True, style='mpl20')
+                  remove_text=True, style='mpl20', tol=0.25)
 def test_imshow_masked_interpolation():
 
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index b4bcecde8..45228e16c 100644
--- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -108,7 +108,6 @@ def test_multiple_keys():
- 
- 
- @image_comparison(baseline_images=['rgba_alpha'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'], remove_text=True)
- def test_alpha_rgba():
-     import matplotlib.pyplot as plt
-@@ -120,7 +119,6 @@ def test_alpha_rgba():
- 
- 
- @image_comparison(baseline_images=['rcparam_alpha'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'], remove_text=True)
- def test_alpha_rcparam():
-     import matplotlib.pyplot as plt
-@@ -148,8 +146,7 @@ def test_fancy():
-                ncol=2, shadow=True, title="My legend", numpoints=1)
- 
- 
-@image_comparison(baseline_images=['framealpha'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+@image_comparison(baseline_images=['framealpha'], remove_text=True)
- def test_framealpha():
-     x = np.linspace(1, 100, 100)
-     y = x
+     cm = copy(plt.get_cmap('viridis'))
 diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
-index bbb442638..b5d291c87 100644
+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):
@@ -474,23 +394,23 @@ index bbb442638..b5d291c87 100644
 @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, recwarn):
+ 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, recwarn):
+@@ -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, recwarn):
+ 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 31c240a60..979ab3ad0 100644
+index ff1abb9c6..cc90e6bb0 100644
 --- a/lib/matplotlib/tests/test_patches.py
 +++ b/lib/matplotlib/tests/test_patches.py
-@@ -259,9 +259,8 @@ def test_wedge_movement():
+@@ -266,9 +266,8 @@ def test_wedge_movement():
         assert getattr(w, attr) == new_v
 
 
@@ -502,36 +422,36 @@ index 31c240a60..979ab3ad0 100644
     ax = plt.axes()
 
 diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
-index 6e80d8d98..0f158eb9e 100644
+index fe7265957..2addc35ed 100644
 --- a/lib/matplotlib/tests/test_patheffects.py
 +++ b/lib/matplotlib/tests/test_patheffects.py
-@@ -119,7 +119,7 @@ def test_SimplePatchShadow_offset():
+@@ -121,7 +121,7 @@ def test_SimplePatchShadow_offset():
     assert pe._offset == (4, 5)
 
 
-@image_comparison(baseline_images=['collection'], tol=0.02, style='mpl20')
-+@image_comparison(baseline_images=['collection'], tol=0.084, style='mpl20')
+-@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 d8ee5ffa7..f43a7fd34 100644
+index 89a5a512e..a25961284 100644
 --- a/lib/matplotlib/tests/test_pickle.py
 +++ b/lib/matplotlib/tests/test_pickle.py
-@@ -41,7 +41,7 @@ def test_simple():
+@@ -42,7 +42,7 @@ def test_simple():
 
 @image_comparison(baseline_images=['multi_pickle'],
                   extensions=['png'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.11,
-                   style='mpl20')
+-                  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 eab049d91..c3708890b 100644
+index a0e1e674f..ede6bfc64 100644
 --- a/lib/matplotlib/tests/test_quiver.py
 +++ b/lib/matplotlib/tests/test_quiver.py
-@@ -155,7 +155,7 @@ def test_quiver_key_xy():
+@@ -131,7 +131,7 @@ def test_quiver_key_pivot():
 
 
 @image_comparison(baseline_images=['barbs_test_image'],
@@ -541,48 +461,37 @@ index eab049d91..c3708890b 100644
     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 6007c9b9a..736105a56 100644
+index 4f70ce861..5bc8184f7 100644
 --- a/lib/matplotlib/tests/test_streamplot.py
 +++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -40,7 +40,7 @@ def test_startpoints():
+@@ -39,8 +39,7 @@ def test_startpoints():
+     plt.plot(start_x, start_y, 'ok')
 
 
- @image_comparison(baseline_images=['streamplot_colormap'],
-                  tol=.04, remove_text=True, style='mpl20')
-+                  remove_text=True, style='mpl20')
+-@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 f36f480af..2b773b042 100644
+index 06985db84..8efaef898 100644
 --- a/lib/matplotlib/tests/test_transforms.py
 +++ b/lib/matplotlib/tests/test_transforms.py
-@@ -70,7 +70,7 @@ def test_external_transform_api():
+@@ -74,7 +74,7 @@ def test_external_transform_api():
 
 
 @image_comparison(baseline_images=['pre_transform_data'],
-                  tol=0.08, remove_text=True, style='mpl20')
-+                  tol=0.155, remove_text=True, style='mpl20')
+-                  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/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index 7d0f38a70..a40d81a4f 100644
--- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -73,7 +73,6 @@ def quantity_converter():
- # Tests that the conversion machinery works properly for classes that
- # work as a facade over numpy arrays (like pint)
- @image_comparison(baseline_images=['plot_pint'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'], remove_text=False, style='mpl20')
- def test_numpy_facade(quantity_converter):
-     # Register the class
 diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
-index 7105a6480..a5fecba1b 100644
+index de7226609..2676fc842 100644
 --- a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
 +++ b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
-@@ -19,7 +19,7 @@ def test_subplot():
+@@ -24,7 +24,7 @@ def test_subplot():
 
 
 @image_comparison(baseline_images=['curvelinear3'],
@@ -590,21 +499,21 @@ index 7105a6480..a5fecba1b 100644
 +                  extensions=['png'], style='default', tol=0.02)
 def test_curvelinear3():
     fig = plt.figure(figsize=(5, 5))
- 
-@@ -74,7 +74,7 @@ def test_curvelinear3():
+     fig.clf()
+@@ -80,7 +80,7 @@ def test_curvelinear3():
 
 
 @image_comparison(baseline_images=['curvelinear4'],
-                  extensions=['png'], style='default', tol=0.015)
+-                  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 32e1c884d..2b38866c5 100644
+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
-@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
+@@ -19,7 +19,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
 
 
 @image_comparison(baseline_images=['custom_transform'],
@@ -613,16 +522,16 @@ index 32e1c884d..2b38866c5 100644
 def test_custom_transform():
     class MyTransform(Transform):
         input_dims = 2
-@@ -85,7 +85,7 @@ def test_custom_transform():
+@@ -91,7 +91,7 @@ def test_custom_transform():
 
 
 @image_comparison(baseline_images=['polar_box'],
-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03),
-+                  tol=0.08,
-                   extensions=['png'], style='default')
+-                  extensions=['png'], style='default', tol=0.03)
+                  extensions=['png'], style='default', tol=0.08)
 def test_polar_box():
     fig = plt.figure(figsize=(5, 5))
-@@ -147,7 +147,7 @@ def test_polar_box():
+ 
+@@ -152,7 +152,7 @@ def test_polar_box():
 
 
 @image_comparison(baseline_images=['axis_direction'],
@@ -632,10 +541,10 @@ index 32e1c884d..2b38866c5 100644
     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 4bfb6f8ff..a6eee9ff6 100644
+index d6e57b9b4..c3ac37a7f 100644
 --- a/lib/mpl_toolkits/tests/test_mplot3d.py
 +++ b/lib/mpl_toolkits/tests/test_mplot3d.py
-@@ -269,7 +269,7 @@ def test_text3d():
+@@ -226,7 +226,7 @@ def test_text3d():
     ax.set_zlabel('Z axis')
 
 
@@ -644,7 +553,7 @@ index 4bfb6f8ff..a6eee9ff6 100644
 def test_trisurf3d():
     n_angles = 36
     n_radii = 8
-@@ -778,7 +778,7 @@ class TestVoxels(object):
+@@ -705,7 +705,7 @@ class TestVoxels(object):
     @image_comparison(
         baseline_images=['voxels-xyz'],
         extensions=['png'],
@@ -654,5 +563,5 @@ index 4bfb6f8ff..a6eee9ff6 100644
     def test_xyz(self):
         fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
 -- 
-2.21.1
+2.20.1

--- a/0003-Increase-some-tolerances-for-non-x86-arches.patch
+++ b/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
+
--- a/0003-Increase-tolerances-for-non-x86_64-arches.patch
+++ b/0003-Increase-tolerances-for-non-x86_64-arches.patch
@@ -1,40 +0,0 @@
-From 83ec21942e1b7d80000d801595c57a653eefa243 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 3/4] Increase tolerances for non-x86_64 arches.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
- lib/matplotlib/tests/test_streamplot.py   | 2 +-
- lib/mpl_toolkits/tests/test_axes_grid1.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index a712680cd..6007c9b9a 100644
--- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -61,7 +61,7 @@ def test_linewidth():
- 
- 
- @image_comparison(baseline_images=['streamplot_masks_and_nans'],
-                  tol=0.04 if on_win else 0,
-+                  tol=0.04 if on_win else 0.01,
-                   remove_text=True, style='mpl20')
- def test_masks_and_nans():
-     X, Y, U, V = velocity_field()
-diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
-index 95b1ae5a3..e054196b4 100644
--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
-+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
-@@ -362,7 +362,7 @@ def test_zooming_with_inverted_axes():
- 
- 
- @image_comparison(baseline_images=['anchored_direction_arrows'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.02,
-                   extensions=['png'])
- def test_anchored_direction_arrows():
-     fig, ax = plt.subplots()
-- 
-2.21.1
-
--- a/0004-Increase-some-tolerances-for-non-x86-arches.patch
+++ b/0004-Increase-some-tolerances-for-non-x86-arches.patch
@@ -1,266 +0,0 @@
-From 390e418a5da886ce1b4358f454342c6af311b00a 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 4/4] 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                           | 4 ++--
- 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_streamplot.py                     | 2 +-
- lib/matplotlib/tests/test_units.py                          | 4 ++--
- .../tests/test_axisartist_grid_helper_curvelinear.py        | 4 ++--
- 13 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index de596a9e0..9f12effa6 100644
--- a/lib/matplotlib/tests/test_arrow_patches.py
-+++ b/lib/matplotlib/tests/test_arrow_patches.py
-@@ -69,7 +69,7 @@ def __prepare_fancyarrow_dpi_cor_test():
- 
- @image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'],
-                   remove_text=True, extensions=['png'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.016,
-                   savefig_kwarg=dict(dpi=100))
- def test_fancyarrow_dpi_cor_100dpi():
-     """
-@@ -85,7 +85,7 @@ def test_fancyarrow_dpi_cor_100dpi():
- 
- @image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'],
-                   remove_text=True, extensions=['png'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.019,
-                   savefig_kwarg=dict(dpi=200))
- def test_fancyarrow_dpi_cor_200dpi():
-     """
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 84a1956ee..eeafd816f 100644
--- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -395,7 +395,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
-@@ -3519,7 +3519,7 @@ def test_vertex_markers():
- 
- @image_comparison(baseline_images=['vline_hline_zorder',
-                                    'errorbar_zorder'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.02)
- def test_eb_line_zorder():
-     x = list(range(10))
- 
-diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
-index ad23abe3f..7b9660f2b 100644
--- a/lib/matplotlib/tests/test_backends_interactive.py
-+++ b/lib/matplotlib/tests/test_backends_interactive.py
-@@ -104,7 +104,7 @@ fig.canvas.mpl_connect("draw_event", lambda event: timer.start())
- 
- plt.show()
- """
-_test_timeout = 10  # Empirically, 1s is not enough on Travis.
-+_test_timeout = 30  # Empirically, 1s is not enough on Travis.
- 
- 
- @pytest.mark.parametrize("backend", _get_testable_interactive_backends())
-diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
-index 773093100..9cce4ed9f 100644
--- a/lib/matplotlib/tests/test_collections.py
-+++ b/lib/matplotlib/tests/test_collections.py
-@@ -442,7 +442,7 @@ def test_barb_limits():
- 
- @image_comparison(baseline_images=['EllipseCollection_test_image'],
-                   extensions=['png'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.012,
-                   remove_text=True)
- def test_EllipseCollection():
-     # Test basic functionality
-diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index e9ae292f6..8e1fcb36f 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -173,7 +173,7 @@ def test_constrained_layout9():
- 
- 
- @image_comparison(baseline_images=['constrained_layout10'],
-        extensions=['png'])
-+        extensions=['png'], tol=0.01)
- def test_constrained_layout10():
-     'Test for handling legend outside axis'
-     fig, axs = plt.subplots(2, 2, constrained_layout=True)
-diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
-index 1254f3c7c..cea1522de 100644
--- a/lib/matplotlib/tests/test_cycles.py
-+++ b/lib/matplotlib/tests/test_cycles.py
-@@ -9,7 +9,7 @@ from cycler import cycler
- 
- 
- @image_comparison(baseline_images=['color_cycle_basic'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.008,
-                   extensions=['png'])
- def test_colorcycle_basic():
-     fig, ax = plt.subplots()
-@@ -27,7 +27,7 @@ def test_colorcycle_basic():
- 
- 
- @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.008,
-                   remove_text=True, extensions=['png'])
- def test_marker_cycle():
-     fig, ax = plt.subplots()
-@@ -61,7 +61,7 @@ def test_marker_cycle():
- 
- 
- @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.009,
-                   extensions=['png'])
- def test_linestylecycle_basic():
-     fig, ax = plt.subplots()
-diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 6ecb3edbe..207659648 100644
--- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -14,7 +14,7 @@ import pytest
- 
- 
- @image_comparison(baseline_images=['figure_align_labels'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.01)
- def test_align_labels():
-     # Check the figure.align_labels() command
-     fig = plt.figure(tight_layout=True)
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 22cd78d46..76149bce4 100644
--- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -810,7 +810,7 @@ def test_imshow_endianess():
- 
- 
- @image_comparison(baseline_images=['imshow_masked_interpolation'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.006,
-                   remove_text=True, style='mpl20')
- def test_imshow_masked_interpolation():
- 
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index b4bcecde8..227b654cc 100644
--- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -108,7 +108,7 @@ def test_multiple_keys():
- 
- 
- @image_comparison(baseline_images=['rgba_alpha'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.007,
-                   extensions=['png'], remove_text=True)
- def test_alpha_rgba():
-     import matplotlib.pyplot as plt
-@@ -120,7 +120,7 @@ def test_alpha_rgba():
- 
- 
- @image_comparison(baseline_images=['rcparam_alpha'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.007,
-                   extensions=['png'], remove_text=True)
- def test_alpha_rcparam():
-     import matplotlib.pyplot as plt
-@@ -149,7 +149,7 @@ def test_fancy():
- 
- 
- @image_comparison(baseline_images=['framealpha'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                  tol=0.018)
- def test_framealpha():
-     x = np.linspace(1, 100, 100)
-     y = x
-diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
-index d8ee5ffa7..607c13346 100644
--- a/lib/matplotlib/tests/test_pickle.py
-+++ b/lib/matplotlib/tests/test_pickle.py
-@@ -41,7 +41,7 @@ def test_simple():
- 
- @image_comparison(baseline_images=['multi_pickle'],
-                   extensions=['png'], remove_text=True,
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.004,
-                   style='mpl20')
- def test_complete():
-     fig = plt.figure('Figure with a label?', figsize=(10, 6))
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index 6007c9b9a..96d43a3e3 100644
--- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -49,7 +49,7 @@ def test_colormap():
- 
- 
- @image_comparison(baseline_images=['streamplot_linewidth'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.002,
-                   remove_text=True, style='mpl20')
- def test_linewidth():
-     X, Y, U, V = velocity_field()
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index 7d0f38a70..ef21a166c 100644
--- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -73,7 +73,7 @@ def quantity_converter():
- # Tests that the conversion machinery works properly for classes that
- # work as a facade over numpy arrays (like pint)
- @image_comparison(baseline_images=['plot_pint'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.003,
-                   extensions=['png'], remove_text=False, style='mpl20')
- def test_numpy_facade(quantity_converter):
-     # Register the class
-@@ -98,7 +98,7 @@ def test_numpy_facade(quantity_converter):
- 
- # Tests gh-8908
- @image_comparison(baseline_images=['plot_masked_units'],
-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-+                  tol=0.007,
-                   extensions=['png'], remove_text=True, style='mpl20')
- def test_plot_masked_units():
-     data = np.linspace(-5, 5)
-diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-index 32e1c884d..741d197b5 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
- 
- 
- @image_comparison(baseline_images=['custom_transform'],
-                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.04)
- def test_custom_transform():
-     class MyTransform(Transform):
-         input_dims = 2
-@@ -85,7 +85,7 @@ def test_custom_transform():
- 
- 
- @image_comparison(baseline_images=['polar_box'],
-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03),
-+                  tol=0.04,
-                   extensions=['png'], style='default')
- def test_polar_box():
-     fig = plt.figure(figsize=(5, 5))
-- 
-2.21.1
-
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -8,8 +8,8 @@
 # happen.
 %global run_tests               1

-# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
-# WXAgg Agg Cairo PS PDF SVG
+# 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

 %if "%{backend}" == "TkAgg"
@@ -20,10 +20,6 @@
 %  else
 %    if "%{backend}" == "Qt5Agg"
 %global backend_subpackage qt5
-%    else
-%      if "%{backend}" == "WXAgg"
-%global backend_subpackage wx
-%      endif
 %    endif
 %  endif
 %endif
@@ -34,16 +30,20 @@
 # 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 3.1.1
+%global mpl_images_version 2.2.3

 # The version of FreeType in this Fedora branch.
-%global ftver 2.10.0
+%if %{fedora} >= 29
+%global ftver 2.9.1
+%else
+%global ftver 2.8
+%endif

 Name:           python-matplotlib
-Version:        3.1.3
+Version:        2.2.4
 Release:        1%{?rctag:.%{rctag}}%{?dist}
 Summary:        Python 2D plotting library
 # qt4_editor backend is MIT
@@ -60,24 +60,19 @@ Patch0001:      0001-Force-using-system-qhull.patch
 Patch0002:      0001-Use-packaged-jquery-and-jquery-ui.patch

 # Fedora-specific patches; see:
-# https://github.com/fedora-python/matplotlib/tree/fedora-patches-v3.1.x
-# https://github.com/fedora-python/matplotlib/tree/fedora-patches-non-x86-v3.1.x
+# 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
-# Increase tolerances for new FreeType everywhere:
-Patch1002:      0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch
 # Image tolerances for anything but x86_64:
-Patch1003:      0003-Increase-tolerances-for-non-x86_64-arches.patch
+Patch1002:      0002-Increase-tolerances-for-non-x86_64-arches.patch
 # Image tolerances for 32-bit systems: i686 armv7hl
-Patch1004:      0004-Increase-some-tolerances-for-32-bit-systems.patch
+Patch1003:      0003-Increase-some-tolerances-for-32-bit-systems.patch
 # Image tolerances for 64-bit (but not x86_64) systems: aarch64 ppc64(le) s390x
-Patch1005:      0004-Increase-some-tolerances-for-non-x86-arches.patch
+Patch1004:      0003-Increase-some-tolerances-for-non-x86-arches.patch

-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  glibc-langpack-en
 BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  qhull-devel
@@ -96,30 +91,185 @@ Matplotlib tries to make easy things easy and hard things possible.
 You can generate plots, histograms, power spectra, bar charts,
 errorcharts, scatterplots, etc, with just a few lines of code.

-%package -n python3-matplotlib-data
+%package -n python2-matplotlib
+Summary:        Python 2D plotting library
+BuildRequires:  python2-numpy
+BuildRequires:  python2-pyparsing
+BuildRequires:  python2-dateutil
+BuildRequires:  python2-kiwisolver
+BuildRequires:  python2-pyside
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-six
+BuildRequires:  python2-sphinx
+BuildRequires:  python2-subprocess32
+BuildRequires:  python2-devel
+BuildRequires:  python2-backports-functools_lru_cache
+BuildRequires:  python2-pillow
+BuildRequires:  python2-pytz
+%if %{with_html}
+BuildRequires:  %{_bindir}/pdftops
+# circular dependency: python2-basemap requires matplotlib
+BuildRequires:  python2-basemap
+BuildRequires:  python2-ipython-sphinx
+BuildRequires:  python2-numpydoc
+BuildRequires:  python2-scikit-image
+BuildRequires:  python2-colorspacious
+BuildRequires:  python2-cycler >= 0.10.0
+%endif
+%if %{run_tests}
+BuildRequires:  python2-pytest
+BuildRequires:  python2-pytest-xdist
+BuildRequires:  python2-cycler >= 0.10.0
+BuildRequires:  python2-mock
+%endif
+Requires:       dejavu-sans-fonts
+Requires:       dvipng
+Requires:       python2-numpy
+Requires:       python2-pyparsing
+Requires:       python2-cycler >= 0.10.0
+Requires:       python2-dateutil
+Requires:       python2-kiwisolver
+Requires:       python2-backports-functools_lru_cache
+Requires:       python-matplotlib-data = %{version}-%{release}
+%{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}
+Recommends:     python2-pillow
+Requires:       python2-six
+Requires:       python2-subprocess32
+Requires:       python2-pytz
+%if !%{with_bundled_fonts}
+Requires:       stix-math-fonts
+%else
+Provides:       bundled(stix-math-fonts)
+%endif
+%{?python_provide:%python_provide python2-matplotlib}
+Provides:       bundled(agg) = 2.4
+Provides:       bundled(ttconv)
+Provides:       bundled(js-jquery1) = 1.11.3
+Provides:       bundled(js-jquery1-ui) = 1.11.4
+Provides:       bundled(texlive-helvetic)
+
+%description -n python2-matplotlib
+Matplotlib is a python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive
+environments across platforms. matplotlib can be used in python
+scripts, the python and ipython shell, web application servers, and
+six graphical user interface toolkits.
+
+Matplotlib tries to make easy things easy and hard things possible.
+You can generate plots, histograms, power spectra, bar charts,
+errorcharts, scatterplots, etc, with just a few lines of code.
+
+%package -n python2-matplotlib-qt4
+Summary:        Qt4 backend for python-matplotlib
+BuildRequires:  PyQt4-devel
+Requires:       python2-PyQt4
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+Requires:       python2-matplotlib-qt5
+%{?python_provide:%python_provide python2-matplotlib-qt4}
+
+%description -n python2-matplotlib-qt4
+%{summary}
+
+%package -n python2-matplotlib-qt5
+Summary:        Qt5 backend for python-matplotlib
+BuildRequires:  python2-qt5
+Requires:       python2-qt5
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-qt5}
+
+%description -n python2-matplotlib-qt5
+%{summary}
+
+%package -n python2-matplotlib-gtk
+Summary:        GTK backend for python-matplotlib
+BuildRequires:  gtk2-devel
+BuildRequires:  pycairo-devel
+BuildRequires:  pygtk2-devel
+Requires:       pycairo
+Requires:       pygtk2
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-gtk}
+
+%description -n python2-matplotlib-gtk
+%{summary}
+
+%package -n python2-matplotlib-gtk3
+Summary:        GTK3 backend for python-matplotlib
+# This should be converted to typelib(Gtk) when supported
+BuildRequires:  gtk3
+BuildRequires:  pygobject3-base
+Requires:       gtk3%{?_isa}
+Requires:       pygobject3-base%{?_isa}
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-gtk3}
+
+%description -n python2-matplotlib-gtk3
+%{summary}
+
+%package -n python2-matplotlib-tk
+Summary:        Tk backend for python-matplotlib
+BuildRequires:  tcl-devel
+BuildRequires:  tkinter
+BuildRequires:  tk-devel
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+Requires:       tkinter
+%{?python_provide:%python_provide python2-matplotlib-tk}
+
+%description -n python2-matplotlib-tk
+%{summary}
+
+%package -n python2-matplotlib-wx
+Summary:        wxPython backend for python-matplotlib
+BuildRequires:  wxPython-devel
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+Requires:       python2-wxpython
+%{?python_provide:%python_provide python2-matplotlib-wx}
+
+%description -n python2-matplotlib-wx
+%{summary}
+
+%package -n python2-matplotlib-test-data
+Summary:        Test data for python2-matplotlib
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-test-data}
+
+%description -n python2-matplotlib-test-data
+%{summary}
+
+%package -n python2-matplotlib-doc
+Summary:        Documentation files for python-matplotlib
+%if %{with_html}
+BuildRequires:  dvipng
+BuildRequires:  graphviz
+BuildRequires:  python2-sphinx
+BuildRequires:  tex(latex)
+BuildRequires:  tex-preview
+%endif
+Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-matplotlib-doc}
+
+%description -n python2-matplotlib-doc
+%{summary}
+
+%package -n python-matplotlib-data
 Summary:        Data used by python-matplotlib
 BuildArch:      noarch
 %if %{with_bundled_fonts}
-Requires:       python3-matplotlib-data-fonts = %{version}-%{release}
+Requires:       python-matplotlib-data-fonts = %{version}-%{release}
 %endif
-Obsoletes:      python-matplotlib-data < 3
-%{?python_provide:%python_provide python3-matplotlib-data}
+%{?python_provide:%python_provide python-matplotlib-data}

-%description -n python3-matplotlib-data
+%description -n python-matplotlib-data
 %{summary}

 %if %{with_bundled_fonts}
-%package -n python3-matplotlib-data-fonts
+%package -n python-matplotlib-data-fonts
 Summary:        Fonts used by python-matplotlib
-# STIX and Computer Modern is OFL
-# DejaVu is Bitstream Vera and Public Domain
-License:        OFL and Bitstream Vera and Public Domain
 BuildArch:      noarch
-Requires:       python3-matplotlib-data = %{version}-%{release}
-Obsoletes:      python-matplotlib-data-fonts < 3
-%{?python_provide:%python_provide python3-matplotlib-data-fonts}
+Requires:       python-matplotlib-data = %{version}-%{release}
+%{?python_provide:%python_provide python-matplotlib-data-fonts}

-%description -n python3-matplotlib-data-fonts
+%description -n python-matplotlib-data-fonts
 %{summary}
 %endif

@@ -136,10 +286,11 @@ BuildRequires:  python3-numpy
 BuildRequires:  python3-pillow
 BuildRequires:  python3-pyparsing
 BuildRequires:  python3-pytz
+BuildRequires:  python3-six
 BuildRequires:  python3-sphinx
 Requires:       dejavu-sans-fonts
 Requires:       dvipng
-Requires:       python3-matplotlib-data = %{version}-%{release}
+Requires:       python-matplotlib-data = %{version}-%{release}
 Requires:       python3-cairo
 Requires:       python3-cycler >= 0.10.0
 Requires:       python3-dateutil
@@ -147,13 +298,13 @@ Requires:       python3-kiwisolver
 Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
 %if %{run_tests}
 BuildRequires:  python3-pytest
-BuildRequires:  python3-pytest-rerunfailures
-BuildRequires:  python3-pytest-timeout
 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
@@ -193,6 +344,7 @@ Requires:       python3-qt5
 %description -n python3-matplotlib-qt5
 %{summary}

+# gtk2 never worked in Python 3 afaict, so no need for -gtk subpackage
 %package -n     python3-matplotlib-gtk3
 Summary:        GTK3 backend for python3-matplotlib
 # This should be converted to typelib(Gtk) when supported
@@ -216,35 +368,6 @@ Requires:       python3-tkinter
 %description -n python3-matplotlib-tk
 %{summary}

-%package -n     python3-matplotlib-wx
-Summary:        WX backend for python3-matplotlib
-BuildRequires:  python3-wxpython4
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python3-wxpython4
-%{?python_provide:%python_provide python3-matplotlib-wx}
-
-%description -n python3-matplotlib-wx
-%{summary}
-
-%package -n python3-matplotlib-doc
-Summary:        Documentation files for python-matplotlib
-%if %{with_html}
-BuildRequires:  dvipng
-BuildRequires:  graphviz
-BuildRequires:  python3-sphinx
-BuildRequires:  tex(latex)
-BuildRequires:  tex-preview
-BuildRequires:  js-jquery >= 3.2.1
-BuildRequires:  xstatic-jquery-ui-common
-Requires:       js-jquery >= 3.2.1
-Requires:       xstatic-jquery-ui-common
-%endif
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-matplotlib-doc}
-
-%description -n python3-matplotlib-doc
-%{summary}
-
 %package -n python3-matplotlib-test-data
 Summary:        Test data for python3-matplotlib
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
@@ -263,21 +386,20 @@ Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 # Fedora-specific patches follow:
 %patch1001 -p1
 # Updated test images for new FreeType.
-%patch1002 -p1
 gzip -dc %SOURCE1000 | tar xvf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
 %ifnarch x86_64
-%patch1003 -p1
+%patch1002 -p1
 %endif
 %ifarch aarch64 ppc64 ppc64le s390x
-%patch1005 -p1
+%patch1004 -p1
 %endif
 %ifarch i686 armv7hl
-%patch1004 -p1
+%patch1003 -p1
 %endif
 rm -r extern/libqhull

 # Copy setup.cfg to the builddir
-cp -p %{SOURCE1} setup.cfg
+sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}

 # Keep this until next version, and increment if changing from
 # USE_FONTCONFIG to False or True so that cache is regenerated
@@ -294,73 +416,102 @@ sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py


 %build
-%set_build_flags
 export http_proxy=http://127.0.0.1/
-
 MPLCONFIGDIR=$PWD \
-  xvfb-run %{__python3} setup.py build
+MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
+  xvfb-run %{__python2} setup.py build
 %if %{with_html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 pushd doc
    MPLCONFIGDIR=$PWD/.. \
+    MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data \
    PYTHONPATH=`realpath ../build/lib.linux*` \
-        %{__python3} make.py html
+        %{__python2} make.py html
 popd
 %endif
 # Ensure all example files are non-executable so that the -doc
 # package doesn't drag in dependencies
 find examples -name '*.py' -exec chmod a-x '{}' \;

+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
+  xvfb-run %{__python3} setup.py build
+# documentation cannot be built with python3 due to syntax errors
+# https://github.com/matplotlib/matplotlib/issues/5805
+
 %install
 export http_proxy=http://127.0.0.1/
-
 MPLCONFIGDIR=$PWD \
-    %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
-chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py
+MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
+  %{__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}%{python3_sitearch}/matplotlib/mpl-data/matplotlibrc \
+mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data/matplotlibrc \
   %{buildroot}%{_sysconfdir}
-mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \
+mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data \
   %{buildroot}%{_datadir}/matplotlib
 %if !%{with_bundled_fonts}
 rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
 %endif

+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
+    %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
+chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py
+rm -fr %{buildroot}%{python3_sitearch}/matplotlib/mpl-data
+
 %if %{run_tests}
 %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.
-#  * test_tinypages fails due to new Sphinx warning
-#  * wxagg is broken on ppc64le:
-#    https://bugzilla.redhat.com/show_bug.cgi?id=1738752
 MPLCONFIGDIR=$PWD \
-MATPLOTLIBRC=%{buildroot}%{_sysconfdir}/matplotlibrc \
+MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
+PYTHONPATH=%{buildroot}%{python2_sitearch} \
+PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run -a -s "-screen 0 640x480x24" \
+         %{__python2} -m pytest --pyargs matplotlib -ra -n $(getconf _NPROCESSORS_ONLN) \
+             -m 'not network' \
+             -k 'not test_invisible_Line_rendering and not test_parasite and not test_polycollection_close and not test_nose_image_comparison'
+
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
 PYTHONDONTWRITEBYTECODE=1 \
     xvfb-run -a -s "-screen 0 640x480x24" \
         %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
             -m 'not network' \
-%ifarch ppc64le
-             -k 'not test_invisible_Line_rendering and not Qt5Agg and not wxagg'
-%else
-             -k 'not test_invisible_Line_rendering and not Qt5Agg'
-%endif
-# Run Qt5Agg tests separately to not conflict with Qt4 tests.
+             -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 \
-MATPLOTLIBRC=%{buildroot}%{_sysconfdir}/matplotlibrc \
+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 -n $(getconf _NPROCESSORS_ONLN) \
-             -m 'not network' -k 'Qt5Agg'
-%endif
+         %{__python3} tests.py -ra \
+             -k 'test_nose_image_comparison'
+%endif # run_tests

-%files -n python3-matplotlib-data
+%files -n python-matplotlib-data
 %{_sysconfdir}/matplotlibrc
 %{_datadir}/matplotlib/mpl-data/
 %if %{with_bundled_fonts}
@@ -368,11 +519,63 @@ PYTHONDONTWRITEBYTECODE=1 \
 %endif

 %if %{with_bundled_fonts}
-%files -n python3-matplotlib-data-fonts
+%files -n python-matplotlib-data-fonts
 %{_datadir}/matplotlib/mpl-data/fonts/
 %endif

-%files -n python3-matplotlib-doc
+%files -n python2-matplotlib
+%license LICENSE/
+%doc README.rst
+%{python2_sitearch}/*egg-info
+%{python2_sitearch}/matplotlib-*-nspkg.pth
+%{python2_sitearch}/matplotlib/
+%exclude %{python2_sitearch}/matplotlib/tests/baseline_images/*
+%{python2_sitearch}/mpl_toolkits/
+%exclude %{python2_sitearch}/mpl_toolkits/tests/baseline_images/*
+%{python2_sitearch}/pylab.py*
+%exclude %{python2_sitearch}/matplotlib/backends/backend_qt4*
+%exclude %{python2_sitearch}/matplotlib/backends/backend_qt5*
+%exclude %{python2_sitearch}/matplotlib/backends/backend_gtk*
+%exclude %{python2_sitearch}/matplotlib/backends/_gtkagg.*
+%exclude %{python2_sitearch}/matplotlib/backends/backend_tkagg.*
+%exclude %{python2_sitearch}/matplotlib/backends/tkagg.*
+%exclude %{python2_sitearch}/matplotlib/backends/_tkagg.so
+%exclude %{python2_sitearch}/matplotlib/backends/backend_wx.*
+%exclude %{python2_sitearch}/matplotlib/backends/backend_wxagg.*
+%exclude %{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/*/*
+
+%files -n python2-matplotlib-test-data
+%{python2_sitearch}/matplotlib/tests/baseline_images/
+%{python2_sitearch}/mpl_toolkits/tests/baseline_images/
+
+%files -n python2-matplotlib-qt4
+%{python2_sitearch}/matplotlib/backends/backend_qt4.*
+%{python2_sitearch}/matplotlib/backends/backend_qt4agg.*
+
+%files -n python2-matplotlib-qt5
+%{python2_sitearch}/matplotlib/backends/backend_qt5.*
+%{python2_sitearch}/matplotlib/backends/backend_qt5agg.*
+
+%files -n python2-matplotlib-gtk
+%{python2_sitearch}/matplotlib/backends/backend_gtk.py*
+%{python2_sitearch}/matplotlib/backends/backend_gtkagg.py*
+%{python2_sitearch}/matplotlib/backends/backend_gtkcairo.py*
+%{python2_sitearch}/matplotlib/backends/_gtkagg.so
+
+%files -n python2-matplotlib-gtk3
+%{python2_sitearch}/matplotlib/backends/backend_gtk3*.py*
+
+%files -n python2-matplotlib-tk
+%{python2_sitearch}/matplotlib/backends/backend_tkagg.py*
+%{python2_sitearch}/matplotlib/backends/tkagg.py*
+%{python2_sitearch}/matplotlib/backends/_tkagg.so
+
+%files -n python2-matplotlib-wx
+%{python2_sitearch}/matplotlib/backends/backend_wx.*
+%{python2_sitearch}/matplotlib/backends/backend_wxagg.*
+
+%files -n python2-matplotlib-doc
 %doc examples
 %if %{with_html}
 %doc doc/build/html/*
@@ -389,23 +592,17 @@ PYTHONDONTWRITEBYTECODE=1 \
 %exclude %{python3_sitearch}/mpl_toolkits/tests/baseline_images/*
 %{python3_sitearch}/pylab.py*
 %{python3_sitearch}/__pycache__/*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*.py
+%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*
 %exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4*
-#exclude #{python3_sitearch}/matplotlib/backends/backend_qt5*.py
-#exclude #{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
+%exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*
 %exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
-%exclude %{python3_sitearch}/matplotlib/backends/_backend_tk.py
-%exclude %{python3_sitearch}/matplotlib/backends/backend_tk*.py
-%exclude %{python3_sitearch}/matplotlib/backends/tkagg.py
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_backend_tk.*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_tk*.*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/tkagg.*
 %exclude %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
 %exclude %{python3_sitearch}/matplotlib/backends/_tkagg.*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_wx*
-%exclude %{python3_sitearch}/matplotlib/backends/wx_compat.*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_wx*
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/wx_compat.*
 %exclude %{_pkgdocdir}/*/

 %files -n python3-matplotlib-test-data
@@ -413,81 +610,30 @@ PYTHONDONTWRITEBYTECODE=1 \
 %{python3_sitearch}/mpl_toolkits/tests/baseline_images/

 %files -n python3-matplotlib-qt4
-%{python3_sitearch}/matplotlib/backends/backend_qt4.py
+%{python3_sitearch}/matplotlib/backends/backend_qt4.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
-%{python3_sitearch}/matplotlib/backends/backend_qt4agg.py
+%{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*

-# This subpackage is empty because the Qt4 backend imports it, so we leave
-# these files in the default package, and only use this one for dependencies.
 %files -n python3-matplotlib-qt5
-#{python3_sitearch}/matplotlib/backends/backend_qt5.py
-#{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*
-#{python3_sitearch}/matplotlib/backends/backend_qt5agg.py
-#{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*
+%{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.*

 %files -n python3-matplotlib-gtk3
-%{python3_sitearch}/matplotlib/backends/backend_gtk*.py
+%{python3_sitearch}/matplotlib/backends/backend_gtk*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*

 %files -n python3-matplotlib-tk
-%{python3_sitearch}/matplotlib/backends/backend_tk*.py
-%{python3_sitearch}/matplotlib/backends/_backend_tk.py
-%{python3_sitearch}/matplotlib/backends/tkagg.py
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tk*.*
-%{python3_sitearch}/matplotlib/backends/__pycache__/_backend_tk.*
+%{python3_sitearch}/matplotlib/backends/backend_tkagg.py*
+%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
+%{python3_sitearch}/matplotlib/backends/tkagg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
 %{python3_sitearch}/matplotlib/backends/_tkagg.*

-%files -n python3-matplotlib-wx
-%{python3_sitearch}/matplotlib/backends/backend_wx*.py
-%{python3_sitearch}/matplotlib/backends/wx_compat.py
-%{python3_sitearch}/matplotlib/backends/__pycache__/backend_wx*
-%{python3_sitearch}/matplotlib/backends/__pycache__/wx_compat.*
-

 %changelog
-* Fri Feb 14 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.3-1
- Update to latest version
-
-* Fri Nov 22 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.2-1
- Update to latest version
-
-* Fri Sep 06 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.1-2
- Backport bool deprecation fix for Python 3.8
-
-* Sun Aug 18 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1-1.1
- Rebuilt for Python 3.8
-
-* Thu Aug 08 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.1.1-1
- Update to latest version
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul  3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.3-2
- Update Obsoletes to be later than the last python2 builds (#1726490)
-
-* Sat Mar 02 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.3-1
- Update to latest version
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Nov 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.2-1
- Update to latest version
-
-* Wed Oct 31 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.1-1
- Update to latest version
-
-* Fri Sep 21 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-2
- Obsolete old python-matplotlib-data* to prevent conflicts and provide an upgrade path
-
-* Wed Sep 19 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.0-1
- Update to latest version
- Drop Python 2 subpackages
- Stop setting a default backend (allow Matplotlib to choose automatically)
-
 * Mon Aug 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.3-1
 - Update to latest version

--- a/setup.cfg
+++ b/setup.cfg
@@ -2,3 +2,6 @@
 tests = True
 toolkits = True
 toolkits_tests = True
+
+[rc_options]
+backend = GTKAgg
--- a/5
+++ b/5
@@ -1,2 +1,3 @@
-SHA512 (matplotlib-3.1.3.tar.gz) = d233a18449eac4c42ecc485d0df0c15e1e306f3945e5476b11b715d6bc190ca6f1c22e7d4b16d6c93c8a569e1c43b68b583339f0921f237a9920c7369854a09e
-SHA512 (matplotlib-3.1.1-with-freetype-2.10.0.tar.gz) = 257546b047ff79302b616f1d37caa028a7b9abc1682cf10861e1347a3db9f437967abe24e11aee898ae11c6f163939d48bc5aeaec2894d6472b4326f8edaed8b
+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
Author	SHA1	Message	Date
Elliott Sales de Andrade	82aa7ee91e	Restore missing sources.	2019-03-17 22:58:10 -04:00
Elliott Sales de Andrade	2c8079f719	Update to 2.2.4.	2019-03-09 23:59:00 -05:00