Also bump the release

Use GTKAgg backend and correct requires
- use GTKAgg backend (#982793) - R python3-matplotlib not python-matplotlib (#988412)
2014-01-25 17:22:02 +01:00 · 2014-01-25 17:20:39 +01:00
17 changed files with 407 additions and 2046 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,44 +2,3 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-1.0.1-without-gpc.tar.gz
 /mpl_sampledata-1.0.1.tar.gz
 /matplotlib-1.2.0-without-gpc.tar.gz
-/matplotlib-1.3.0-without-gpc.tar.xz
-/matplotlib-1.3.1-without-gpc.tar.xz
-/matplotlib-1.4.3-without-gpc.tar.xz
-/matplotlib-1.4.3-without-extern.tar.xz
-/matplotlib-1.5.1-without-extern.tar.xz
-/matplotlib-1.5.1.tar.gz
-/matplotlib-1.5.2rc2.tar.gz
-/matplotlib-2.0.0b4.tar.gz
-/matplotlib-2.0.0rc2.tar.gz
-/matplotlib-2.0.0.tar.gz
-/matplotlib-2.0.0-without-copyrighted.tar.xz
-/matplotlib-2.0.1.tar.gz
-/matplotlib-2.0.2.tar.gz
-/matplotlib-2.1.0rc1.tar.gz
-/matplotlib-2.1.0.tar.gz
-/matplotlib-2.1.1.tar.gz
-/matplotlib-2.1.2.tar.gz
-/matplotlib-2.1.2-with-freetype-2.8.tar.gz
-/matplotlib-2.2.2.tar.gz
-/matplotlib-2.2.2-with-freetype-2.8.tar.gz
-/matplotlib-2.2.2-with-freetype-2.9.tar.gz
-/matplotlib-2.2.3.tar.gz
-/matplotlib-2.2.3-with-freetype-2.8.tar.gz
-/matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0rc1.tar.gz
-/matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0rc2.tar.gz
-/matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.0.tar.gz
-/matplotlib-3.0.0-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.1.tar.gz
-/matplotlib-3.0.1-with-freetype-2.9.1.tar.gz
-/matplotlib-3.0.2.tar.gz
-/matplotlib-3.0.3.tar.gz
-/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
--- 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 +0,0 @@
-From ee5c28ea8cd17cbc04d5a9b79d5ce1326df93466 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(-)
-
-diff --git a/setupext.py b/setupext.py
-index 3e8b382cc..66a278b0c 100644
--- a/setupext.py
-+++ b/setupext.py
-@@ -838,14 +838,12 @@ class Png(SetupPackage):
- class Qhull(SetupPackage):
-     name = "qhull"
- 
-+    def check(self):
-+        self.__class__.found_external = True
-+        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')
-+        ext.libraries.append('qhull')
- 
- 
- class TTConv(SetupPackage):
-- 
-2.21.0
-
--- 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,123 +0,0 @@
-From c2af74bf18d46d03ec34bfda32afe1a99511ac9f 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(-)
-
-diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html
-index 41f48dc6d..69097eb4f 100644
--- a/lib/matplotlib/backends/web_backend/all_figures.html
-+++ b/lib/matplotlib/backends/web_backend/all_figures.html
-@@ -3,9 +3,9 @@
-     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
-     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
-     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
-    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
-+    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
-+    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
-+    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
-     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
-     <script src="{{ prefix }}/js/mpl.js"></script>
- 
-diff --git a/lib/matplotlib/backends/web_backend/single_figure.html b/lib/matplotlib/backends/web_backend/single_figure.html
-index 4d5a366fb..c11c86618 100644
--- a/lib/matplotlib/backends/web_backend/single_figure.html
-+++ b/lib/matplotlib/backends/web_backend/single_figure.html
-@@ -3,9 +3,9 @@
-     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
-     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
-     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
-    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
-    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
-+    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
-+    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
-+    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
-     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
-     <script src="{{ prefix }}/js/mpl.js"></script>
-     <script>
-diff --git a/setup.py b/setup.py
-index adabf1753..57d6b91b4 100644
--- a/setup.py
-+++ b/setup.py
-@@ -27,8 +27,6 @@ from zipfile import ZipFile
- 
- from setuptools import setup, Extension
- 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
- 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)
-        try:
-            buff = download_or_cache(url, sha)
-        except Exception:
-            raise IOError("Failed to download jquery-ui.  Please download " +
-                          "{url} and extract it to {dest}.".format(
-                              url=url, dest=dest))
-        with ZipFile(buff) as zf:
-            zf.extractall(dest)
-
-
-# Relying on versioneer's implementation detail.
-class sdist_with_jquery(cmdclass['sdist']):
-    def make_release_tree(self, base_dir, files):
-        super(sdist_with_jquery, self).make_release_tree(base_dir, files)
-        _download_jquery_to(
-            os.path.join(base_dir, "lib/matplotlib/backends/web_backend/"))
-
-
-# Affects install and bdist_wheel.
-class install_lib_with_jquery(InstallLibCommand):
-    def run(self):
-        super(install_lib_with_jquery, self).run()
-        _download_jquery_to(
-            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
-
-
-class develop_with_jquery(DevelopCommand):
-    def run(self):
-        super(develop_with_jquery, self).run()
-        _download_jquery_to("lib/matplotlib/backends/web_backend/")
-
-
-cmdclass['sdist'] = sdist_with_jquery
-cmdclass['install_lib'] = install_lib_with_jquery
-cmdclass['develop'] = develop_with_jquery
-
-
- # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
- # however, this is needed on Windows to avoid creating infinite subprocesses
- # when using multiprocessing.
-- 
-2.21.0
-
--- a/0001-matplotlibrc-path-search-fix.patch
+++ b/0001-matplotlibrc-path-search-fix.patch
@@ -1,105 +0,0 @@
-From 9776757607af144c824d72920f8983efc35face3 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
-
-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(-)
-
-diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 825303171..7a4115491 100644
--- a/lib/matplotlib/__init__.py
-+++ b/lib/matplotlib/__init__.py
-@@ -624,18 +624,8 @@ def _get_data_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')
- 
-     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.
-     """
- 
-     def gen_candidates():
-@@ -692,7 +681,7 @@ def matplotlib_fname():
-             yield matplotlibrc
-             yield os.path.join(matplotlibrc, 'matplotlibrc')
-         yield os.path.join(get_configdir(), 'matplotlibrc')
-        yield os.path.join(get_data_path(), 'matplotlibrc')
-+        yield '/etc/matplotlibrc'
- 
-     for fname in gen_candidates():
-         if os.path.exists(fname) and not os.path.isdir(fname):
-diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
-index d8fe73ceb..c3aeb58ef 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():
-         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')
-+
-+
-+def test_if_rctemplate_is_up_to_date(mplrc):
-     # This tests if the matplotlibrc.template file contains all valid rcParams.
-     deprecated = {*mpl._all_deprecated, *mpl._deprecated_remain_as_none}
-    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
-    with open(path_to_rc, "r") as f:
-+    with open(mplrc, "r") as f:
-         rclines = f.readlines()
-     missing = {}
-     for k, v in mpl.defaultParams.items():
-@@ -484,11 +491,10 @@ def test_if_rctemplate_is_up_to_date():
-                          .format(missing.items()))
- 
- 
-def test_if_rctemplate_would_be_valid(tmpdir):
-+def test_if_rctemplate_would_be_valid(tmpdir, mplrc):
-     # This tests if the matplotlibrc.template file would result in a valid
-     # rc file if all lines are uncommented.
-    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
-    with open(path_to_rc, "r") as f:
-+    with open(mplrc, "r") as f:
-         rclines = f.readlines()
-     newlines = []
-     for line in rclines:
-- 
-2.21.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-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-32-bit-systems.patch
+++ b/0004-Increase-some-tolerances-for-32-bit-systems.patch
@@ -1,658 +0,0 @@
-From d9fada8cc0ef89142222f4c163ec9dd155662cb6 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.
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
- lib/matplotlib/testing/decorators.py          |  2 +-
- lib/matplotlib/tests/test_artist.py           |  3 +-
- lib/matplotlib/tests/test_axes.py             | 49 ++++++++++---------
- lib/matplotlib/tests/test_collections.py      |  2 +-
- lib/matplotlib/tests/test_colorbar.py         | 11 +++--
- .../tests/test_constrainedlayout.py           |  2 +-
- lib/matplotlib/tests/test_contour.py          |  8 +--
- lib/matplotlib/tests/test_cycles.py           |  3 --
- lib/matplotlib/tests/test_figure.py           |  3 +-
- lib/matplotlib/tests/test_image.py            |  2 +-
- lib/matplotlib/tests/test_legend.py           |  5 +-
- lib/matplotlib/tests/test_mathtext.py         |  4 +-
- lib/matplotlib/tests/test_patches.py          |  3 +-
- lib/matplotlib/tests/test_patheffects.py      |  2 +-
- lib/matplotlib/tests/test_pickle.py           |  2 +-
- lib/matplotlib/tests/test_quiver.py           |  2 +-
- lib/matplotlib/tests/test_streamplot.py       |  2 +-
- lib/matplotlib/tests/test_transforms.py       |  2 +-
- lib/matplotlib/tests/test_units.py            |  1 -
- .../tests/test_axisartist_floating_axes.py    |  4 +-
- ...test_axisartist_grid_helper_curvelinear.py |  6 +--
- lib/mpl_toolkits/tests/test_mplot3d.py        |  4 +-
- 22 files changed, 59 insertions(+), 63 deletions(-)
-
-diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
-index 04d5bcda8..70de0263b 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,
-     return decorator
- 
- 
-def image_comparison(baseline_images, extensions=None, tol=0,
-+def image_comparison(baseline_images, extensions=None, tol=0.1,
-                      freetype_version=None, remove_text=False,
-                      savefig_kwarg=None,
-                      # Default of mpl_test_settings fixture and cleanup too.
-diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
-index 9bf15d0b9..5339dd2eb 100644
--- a/lib/matplotlib/tests/test_artist.py
-+++ b/lib/matplotlib/tests/test_artist.py
-@@ -94,7 +94,8 @@ def test_collection_transform_of_none():
-     assert isinstance(c._transOffset, mtransforms.IdentityTransform)
- 
- 
-@image_comparison(baseline_images=["clip_path_clipping"], remove_text=True)
-+@image_comparison(baseline_images=["clip_path_clipping"], remove_text=True,
-+                  tol=0.28)
- def test_clipping():
-     exterior = mpath.Path.unit_rectangle().deepcopy()
-     exterior.vertices *= 4
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 84a1956ee..50eb0e6a4 100644
--- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -562,7 +562,7 @@ def test_single_point():
- 
- 
- @image_comparison(baseline_images=['single_date'], extensions=['png'],
-        style='mpl20')
-+        style='mpl20', tol=1.97)
- def test_single_date():
-     time1 = [721964.0]
-     data1 = [-65.54]
-@@ -1079,7 +1079,7 @@ def test_fill_between_interpolate():
- 
- 
- @image_comparison(baseline_images=['fill_between_interpolate_decreasing'],
-                  style='mpl20', remove_text=True)
-+                  style='mpl20', remove_text=True, tol=0.78)
- def test_fill_between_interpolate_decreasing():
-     p = np.array([724.3, 700, 655])
-     t = np.array([9.4, 7, 2.2])
-@@ -1164,7 +1164,8 @@ def test_pcolormesh():
- 
- 
- @image_comparison(baseline_images=['pcolormesh_datetime_axis'],
-                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.19)
- def test_pcolormesh_datetime_axis():
-     fig = plt.figure()
-     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
-@@ -1190,7 +1191,8 @@ def test_pcolormesh_datetime_axis():
- 
- 
- @image_comparison(baseline_images=['pcolor_datetime_axis'],
-                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.19)
- def test_pcolor_datetime_axis():
-     fig = plt.figure()
-     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
-@@ -1247,7 +1249,7 @@ def test_canonical():
- 
- 
- @image_comparison(baseline_images=['arc_angles'], remove_text=True,
-                  style='default', extensions=['png'])
-+                  style='default', extensions=['png'], tol=0.17)
- def test_arc_angles():
-     from matplotlib import patches
-     # Ellipse parameters
-@@ -2644,7 +2646,7 @@ def test_boxplot_mod_artist_after_plotting():
- 
- @image_comparison(baseline_images=['violinplot_vert_baseline',
-                                    'violinplot_vert_baseline'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.24)
- def test_vert_violinplot_baseline():
-     # First 9 digits of frac(sqrt(2))
-     np.random.seed(414213562)
-@@ -2662,7 +2664,7 @@ def test_vert_violinplot_baseline():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showmeans'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_vert_violinplot_showmeans():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(3))
-@@ -2673,7 +2675,7 @@ def test_vert_violinplot_showmeans():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showextrema'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_vert_violinplot_showextrema():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(5))
-@@ -2684,7 +2686,7 @@ def test_vert_violinplot_showextrema():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showmedians'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_vert_violinplot_showmedians():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(7))
-@@ -2695,7 +2697,7 @@ def test_vert_violinplot_showmedians():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_showall'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
- def test_vert_violinplot_showall():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(11))
-@@ -2706,7 +2708,7 @@ def test_vert_violinplot_showall():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_vert_violinplot_custompoints_10():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(13))
-@@ -2717,7 +2719,7 @@ def test_vert_violinplot_custompoints_10():
- 
- 
- @image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_vert_violinplot_custompoints_200():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(17))
-@@ -2728,7 +2730,7 @@ def test_vert_violinplot_custompoints_200():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_baseline'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
- def test_horiz_violinplot_baseline():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(19))
-@@ -2739,7 +2741,7 @@ def test_horiz_violinplot_baseline():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showmedians'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
- def test_horiz_violinplot_showmedians():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(23))
-@@ -2750,7 +2752,7 @@ def test_horiz_violinplot_showmedians():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showmeans'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.25)
- def test_horiz_violinplot_showmeans():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(29))
-@@ -2761,7 +2763,7 @@ def test_horiz_violinplot_showmeans():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showextrema'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
- def test_horiz_violinplot_showextrema():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(31))
-@@ -2772,7 +2774,7 @@ def test_horiz_violinplot_showextrema():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_showall'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.19)
- def test_horiz_violinplot_showall():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(37))
-@@ -2783,7 +2785,7 @@ def test_horiz_violinplot_showall():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_horiz_violinplot_custompoints_10():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(41))
-@@ -2794,7 +2796,7 @@ def test_horiz_violinplot_custompoints_10():
- 
- 
- @image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
- def test_horiz_violinplot_custompoints_200():
-     ax = plt.axes()
-     # First 9 digits of frac(sqrt(43))
-@@ -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():
- 
- 
- @image_comparison(baseline_images=['csd_freqs'], remove_text=True,
-                  extensions=['png'], tol=0.002)
-+                  extensions=['png'], tol=0.21)
- def test_csd_freqs():
-     '''test axes.csd with sinusoidal stimuli'''
-     n = 10000
-@@ -5117,7 +5118,7 @@ def test_rc_spines():
- 
- 
- @image_comparison(baseline_images=['rc_grid'], extensions=['png'],
-                  savefig_kwarg={'dpi': 40})
-+                  savefig_kwarg={'dpi': 40}, tol=0.2)
- def test_rc_grid():
-     fig = plt.figure()
-     rc_dict0 = {
-@@ -5679,7 +5680,7 @@ def test_date_timezone_y():
- 
- 
- @image_comparison(baseline_images=['date_timezone_x_and_y'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=3.05)
- def test_date_timezone_x_and_y():
-     # Tests issue 5575
-     UTC = datetime.timezone.utc
-diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
-index 773093100..37356d5e0 100644
--- a/lib/matplotlib/tests/test_collections.py
-+++ b/lib/matplotlib/tests/test_collections.py
-@@ -466,7 +466,7 @@ def test_EllipseCollection():
- 
- 
- @image_comparison(baseline_images=['polycollection_close'],
-                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.45)
- def test_polycollection_close():
-     from mpl_toolkits.mplot3d import Axes3D
- 
-diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
-index c65ad02c3..79deb249c 100644
--- a/lib/matplotlib/tests/test_colorbar.py
-+++ b/lib/matplotlib/tests/test_colorbar.py
-@@ -97,7 +97,7 @@ def _colorbar_extension_length(spacing):
- @image_comparison(
-         baseline_images=['colorbar_extensions_shape_uniform',
-                          'colorbar_extensions_shape_proportional'],
-        extensions=['png'])
-+        extensions=['png'], tol=0.16)
- def test_colorbar_extension_shape():
-     '''Test rectangular colorbar extensions.'''
-     # Create figures for uniform and proportionally spaced colorbars.
-@@ -107,7 +107,7 @@ def test_colorbar_extension_shape():
- 
- @image_comparison(baseline_images=['colorbar_extensions_uniform',
-                                    'colorbar_extensions_proportional'],
-                  extensions=['png'])
-+                  extensions=['png'], tol=0.25)
- def test_colorbar_extension_length():
-     '''Test variable length colorbar extensions.'''
-     # Create figures for uniform and proportionally spaced colorbars.
-@@ -121,7 +121,7 @@ def test_colorbar_extension_length():
-                                    'cbar_sharing',
-                                    ],
-                   extensions=['png'], remove_text=True,
-                  savefig_kwarg={'dpi': 40})
-+                  savefig_kwarg={'dpi': 40}, tol=0.17)
- def test_colorbar_positioning():
-     data = np.arange(1200).reshape(30, 40)
-     levels = [0, 200, 400, 600, 800, 1000, 1200]
-@@ -175,7 +175,7 @@ def test_colorbar_positioning():
- 
- @image_comparison(baseline_images=['cbar_with_subplots_adjust'],
-                   extensions=['png'], remove_text=True,
-                  savefig_kwarg={'dpi': 40})
-+                  savefig_kwarg={'dpi': 40}, tol=0.17)
- def test_gridspec_make_colorbar():
-     plt.figure()
-     data = np.arange(1200).reshape(30, 40)
-@@ -233,7 +233,8 @@ def test_colorbarbase():
- 
- @image_comparison(
-     baseline_images=['colorbar_closed_patch'],
-    remove_text=True)
-+    remove_text=True,
-+    tol=0.22)
- def test_colorbar_closed_patch():
-     fig = plt.figure(figsize=(8, 6))
-     ax1 = fig.add_axes([0.05, 0.85, 0.9, 0.1])
-diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index e9ae292f6..0edfa1e27 100644
--- a/lib/matplotlib/tests/test_constrainedlayout.py
-+++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -246,7 +246,7 @@ def test_constrained_layout12():
-     ax.set_xlabel('x-label')
- 
- 
-@image_comparison(baseline_images=['constrained_layout13'], tol=2.e-2,
-+@image_comparison(baseline_images=['constrained_layout13'], tol=3.e-2,
-         extensions=['png'])
- def test_constrained_layout13():
-     'Test that padding works.'
-diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index d78dcb1ff..ad39426e2 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():
- 
- 
- @image_comparison(baseline_images=['contour_datetime_axis'],
-                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.18)
- def test_contour_datetime_axis():
-     fig = plt.figure()
-     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
-@@ -252,7 +253,8 @@ def test_contour_datetime_axis():
- 
- 
- @image_comparison(baseline_images=['contour_test_label_transforms'],
-                  extensions=['png'], remove_text=True, style='mpl20')
-+                  extensions=['png'], remove_text=True, style='mpl20',
-+                  tol=1.38)
- def test_labels():
-     # Adapted from pylab_examples example code: contour_demo.py
-     # see issues #2475, #2843, and #2818 for explanation
-@@ -283,7 +285,7 @@ def test_labels():
- 
- @image_comparison(baseline_images=['contour_corner_mask_False',
-                                    'contour_corner_mask_True'],
-                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.19)
- def test_corner_mask():
-     n = 60
-     mask_level = 0.95
-diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
-index 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
--- 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.25,
-                   remove_text=True, style='mpl20')
- def test_imshow_masked_interpolation():
- 
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index 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
-diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
-index bbb442638..b5d291c87 100644
--- a/lib/matplotlib/tests/test_mathtext.py
-+++ b/lib/matplotlib/tests/test_mathtext.py
-@@ -173,7 +173,7 @@ def baseline_images(request, fontset, index):
-                          ['cm', 'stix', 'stixsans', 'dejavusans',
-                           'dejavuserif'])
- @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
-@image_comparison(baseline_images=None)
-+@image_comparison(baseline_images=None, tol=0.31)
- def test_mathtext_rendering(baseline_images, fontset, index, test, recwarn):
-     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):
-                          ['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):
-     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
--- a/lib/matplotlib/tests/test_patches.py
-+++ b/lib/matplotlib/tests/test_patches.py
-@@ -259,9 +259,8 @@ def test_wedge_movement():
-         assert getattr(w, attr) == new_v
- 
- 
-# png needs tol>=0.06, pdf tol>=1.617
- @image_comparison(baseline_images=['wedge_range'],
-                  remove_text=True, tol=1.65 if on_win else 0)
-+                  remove_text=True)
- def test_wedge_range():
-     ax = plt.axes()
- 
-diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
-index 6e80d8d98..0f158eb9e 100644
--- a/lib/matplotlib/tests/test_patheffects.py
-+++ b/lib/matplotlib/tests/test_patheffects.py
-@@ -119,7 +119,7 @@ def test_SimplePatchShadow_offset():
-     assert pe._offset == (4, 5)
- 
- 
-@image_comparison(baseline_images=['collection'], tol=0.02, style='mpl20')
-+@image_comparison(baseline_images=['collection'], tol=0.084, style='mpl20')
- def test_collection():
-     x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
-     data = np.sin(x) + np.cos(y)
-diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
-index d8ee5ffa7..f43a7fd34 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.11,
-                   style='mpl20')
- def test_complete():
-     fig = plt.figure('Figure with a label?', figsize=(10, 6))
-diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
-index eab049d91..c3708890b 100644
--- a/lib/matplotlib/tests/test_quiver.py
-+++ b/lib/matplotlib/tests/test_quiver.py
-@@ -155,7 +155,7 @@ def test_quiver_key_xy():
- 
- 
- @image_comparison(baseline_images=['barbs_test_image'],
-                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.11)
- def test_barbs():
-     x = np.linspace(-5, 5, 5)
-     X, Y = np.meshgrid(x, x)
-diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index 6007c9b9a..736105a56 100644
--- a/lib/matplotlib/tests/test_streamplot.py
-+++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -40,7 +40,7 @@ def test_startpoints():
- 
- 
- @image_comparison(baseline_images=['streamplot_colormap'],
-                  tol=.04, remove_text=True, style='mpl20')
-+                  remove_text=True, style='mpl20')
- def test_colormap():
-     X, Y, U, V = velocity_field()
-     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
-diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
-index f36f480af..2b773b042 100644
--- a/lib/matplotlib/tests/test_transforms.py
-+++ b/lib/matplotlib/tests/test_transforms.py
-@@ -70,7 +70,7 @@ def test_external_transform_api():
- 
- 
- @image_comparison(baseline_images=['pre_transform_data'],
-                  tol=0.08, remove_text=True, style='mpl20')
-+                  tol=0.155, remove_text=True, style='mpl20')
- def test_pre_transform_plotting():
-     # a catch-all for as many as possible plot layouts which handle
-     # pre-transforming the data NOTE: The axis range is important in this
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index 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
--- 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():
- 
- 
- @image_comparison(baseline_images=['curvelinear3'],
-                  extensions=['png'], style='default', tol=0.01)
-+                  extensions=['png'], style='default', tol=0.02)
- def test_curvelinear3():
-     fig = plt.figure(figsize=(5, 5))
- 
-@@ -74,7 +74,7 @@ def test_curvelinear3():
- 
- 
- @image_comparison(baseline_images=['curvelinear4'],
-                  extensions=['png'], style='default', tol=0.015)
-+                  extensions=['png'], style='default', tol=0.055)
- def test_curvelinear4():
-     fig = plt.figure(figsize=(5, 5))
- 
-diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-index 32e1c884d..2b38866c5 100644
--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
- 
- 
- @image_comparison(baseline_images=['custom_transform'],
-                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.035)
- def test_custom_transform():
-     class MyTransform(Transform):
-         input_dims = 2
-@@ -85,7 +85,7 @@ def test_custom_transform():
- 
- 
- @image_comparison(baseline_images=['polar_box'],
-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03),
-+                  tol=0.08,
-                   extensions=['png'], style='default')
- def test_polar_box():
-     fig = plt.figure(figsize=(5, 5))
-@@ -147,7 +147,7 @@ def test_polar_box():
- 
- 
- @image_comparison(baseline_images=['axis_direction'],
-                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.05)
- def test_axis_direction():
-     fig = plt.figure(figsize=(5, 5))
- 
-diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
-index 4bfb6f8ff..a6eee9ff6 100644
--- a/lib/mpl_toolkits/tests/test_mplot3d.py
-+++ b/lib/mpl_toolkits/tests/test_mplot3d.py
-@@ -269,7 +269,7 @@ def test_text3d():
-     ax.set_zlabel('Z axis')
- 
- 
-@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.03)
-+@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.05)
- def test_trisurf3d():
-     n_angles = 36
-     n_radii = 8
-@@ -778,7 +778,7 @@ class TestVoxels(object):
-     @image_comparison(
-         baseline_images=['voxels-xyz'],
-         extensions=['png'],
-        tol=0.01
-+        tol=0.02
-     )
-     def test_xyz(self):
-         fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
-- 
-2.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/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+version=$1
+
+[ -z $version ] && exit 1
+
+dir=matplotlib-${version}
+file=matplotlib-${version}.tar.gz
+result=matplotlib-${version}-without-gpc.tar.gz
+
+wget -vc http://downloads.sourceforge.net/matplotlib/$file
+
+rm -rf matplotlib-${version}
+tar xzf $file
+
+rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
+
+rm -f $result
+tar czf $result $dir
--- a/python-matplotlib-fontconfig.patch
+++ b/python-matplotlib-fontconfig.patch
@@ -0,0 +1,64 @@
+diff -ur matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py matplotlib-1.2.0/lib/matplotlib/font_manager.py
+--- matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py	2012-10-31 01:11:14.000000000 +0100
+++ matplotlib-1.2.0/lib/matplotlib/font_manager.py	2013-04-03 01:50:34.433802284 +0200
+@@ -62,7 +62,7 @@
+ except ImportError:
+     import pickle
+ 
+-USE_FONTCONFIG = False
+USE_FONTCONFIG = True
+ 
+ verbose = matplotlib.verbose
+ 
+@@ -771,7 +771,7 @@
+                 return float(self._size)
+             except ValueError:
+                 pass
+-        default_size = fontManager.get_default_size()
+        default_size = FontManager.get_default_size()
+         return default_size * font_scalings.get(self._size)
+ 
+     def get_file(self):
+@@ -991,7 +991,10 @@
+         self.afmfiles = findSystemFonts(paths, fontext='afm') + \
+             findSystemFonts(fontext='afm')
+         self.afmlist = createFontList(self.afmfiles, fontext='afm')
+-        self.defaultFont['afm'] = self.afmfiles[0]
+        try:
+            self.defaultFont['afm'] = self.afmfiles[0]
+        except IndexError:
+            self.defaultFont['afm'] = None
+ 
+         self.ttf_lookup_cache = {}
+         self.afm_lookup_cache = {}
+@@ -1002,7 +1005,8 @@
+         """
+         return self.__default_weight
+ 
+-    def get_default_size(self):
+    @staticmethod
+    def get_default_size():
+         """
+         Return the default font size.
+         """
+@@ -1276,7 +1280,7 @@
+         except OSError:
+             return None
+         if pipe.returncode == 0:
+-            for match in _fc_match_regex.finditer(output):
+            for match in _fc_match_regex.finditer(output.decode("utf-8")):
+                 file = match.group(1)
+                 if os.path.splitext(file)[1][1:] in fontexts:
+                     return file
+diff -ur matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc
+--- matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc	2012-11-08 17:39:20.000000000 +0100
+++ matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc	2013-04-03 01:50:03.693755542 +0200
+@@ -198,7 +198,7 @@
+ #mathtext.it  : serif:italic
+ #mathtext.bf  : serif:bold
+ #mathtext.sf  : sans
+-#mathtext.fontset : cm # Should be 'cm' (Computer Modern), 'stix',
+mathtext.fontset : stix # Should be 'cm' (Computer Modern), 'stix',
+                        # 'stixsans' or 'custom'
+ #mathtext.fallback_to_cm : True  # When True, use symbols from the Computer Modern
+                                  # fonts when a symbol can not be found in one of
--- a/python-matplotlib-noagg.patch
+++ b/python-matplotlib-noagg.patch
@@ -0,0 +1,73 @@
+diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
+--- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:49:21.295712608 -0200
+++ matplotlib-1.2.0/setupext.py	2012-11-23 14:49:31.508712999 -0200
+@@ -96,7 +96,6 @@ BUILT_GDK       = False
+ BUILT_PATH      = False
+ BUILT_TRI       = False
+ 
+-AGG_VERSION = 'agg24'
+ TCL_TK_CACHE = None
+ 
+ # for nonstandard installation/build with --prefix variable
+@@ -621,7 +620,8 @@ def add_agg_flags(module):
+     # before adding the freetype flags since -z comes later
+     add_base_flags(module)
+     add_numpy_flags(module)
+-    module.include_dirs.extend(['src', '%s/include'%AGG_VERSION, '.'])
+    module.include_dirs.extend(['src', '/usr/include/agg2', '.'])
+    module.libraries.append('agg')
+ 
+     # put these later for correct link order
+     module.libraries.extend(std_libs)
+@@ -1220,17 +1220,7 @@ def build_agg(ext_modules, packages):
+     global BUILT_AGG
+     if BUILT_AGG: return # only build it if you you haven't already
+ 
+-    agg = (
+-           'agg_trans_affine.cpp',
+-           'agg_bezier_arc.cpp',
+-           'agg_curves.cpp',
+-           'agg_vcgen_dash.cpp',
+-           'agg_vcgen_stroke.cpp',
+-           'agg_image_filters.cpp',
+-           )
+-
+-    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
+-    deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
+    deps = ['src/mplutils.cpp', 'src/agg_py_transforms.cpp']
+     deps.extend(glob.glob('CXX/*.cxx'))
+     deps.extend(glob.glob('CXX/*.c'))
+     temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
+@@ -1253,16 +1243,7 @@ def build_path(ext_modules, packages):
+     global BUILT_PATH
+     if BUILT_PATH: return # only build it if you you haven't already
+ 
+-    agg = (
+-           'agg_vcgen_contour.cpp',
+-           'agg_curves.cpp',
+-           'agg_bezier_arc.cpp',
+-           'agg_trans_affine.cpp',
+-           'agg_vcgen_stroke.cpp',
+-           )
+-
+-    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
+-    deps.extend(glob.glob('CXX/*.cxx'))
+    deps = glob.glob('CXX/*.cxx')
+     deps.extend(glob.glob('CXX/*.c'))
+ 
+     temp_copy('src/_path.cpp', 'src/path.cpp')
+@@ -1287,14 +1268,8 @@ def build_image(ext_modules, packages):
+     global BUILT_IMAGE
+     if BUILT_IMAGE: return # only build it if you you haven't already
+ 
+-    agg = ('agg_trans_affine.cpp',
+-           'agg_image_filters.cpp',
+-           'agg_bezier_arc.cpp',
+-           )
+-
+     temp_copy('src/_image.cpp', 'src/image.cpp')
+     deps = ['src/image.cpp', 'src/mplutils.cpp']
+-    deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
+     deps.extend(glob.glob('CXX/*.cxx'))
+     deps.extend(glob.glob('CXX/*.c'))
+ 
--- a/python-matplotlib-tk.patch
+++ b/python-matplotlib-tk.patch
@@ -0,0 +1,35 @@
+diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
+--- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:50:48.954715965 -0200
+++ matplotlib-1.2.0/setupext.py	2012-11-23 14:55:53.731727636 -0200
+@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
+ 
+     tcl_poss = [tcl_lib_dir,
+                 os.path.normpath(os.path.join(tcl_lib_dir, '..')),
+-                "/usr/lib/tcl"+str(Tkinter.TclVersion),
+-                "/usr/lib"]
+                "@@libdir@@/tcl"+str(Tkinter.TclVersion),
+                "@@libdir@@"]
+     tk_poss = [tk_lib_dir,
+                 os.path.normpath(os.path.join(tk_lib_dir, '..')),
+-               "/usr/lib/tk"+str(Tkinter.TkVersion),
+-               "/usr/lib"]
+               "@@libdir@@/tk"+str(Tkinter.TkVersion),
+               "@@libdir@@"]
+     for ptcl, ptk in zip(tcl_poss, tk_poss):
+         tcl_config = os.path.join(ptcl, "tclConfig.sh")
+         tk_config = os.path.join(ptk, "tkConfig.sh")
+@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
+     return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
+ 
+ def hardcoded_tcl_config():
+-    tcl_inc = "/usr/local/include"
+-    tk_inc = "/usr/local/include"
+-    tcl_lib = "/usr/local/lib"
+-    tk_lib = "/usr/local/lib"
+    tcl_inc = "/usr/include"
+    tk_inc = "/usr/include"
+    tcl_lib = "@@libdir@@"
+    tk_lib = "@@libdir@@"
+     return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
+ 
+ def add_tk_flags(module):
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -1,89 +1,67 @@
-%global with_html               0
-
-# It seems like there's some kind of weird occasional error where a
-# build (often aarch64 or ppc64) will fail in one of the Stix font
-# tests with a huge RMS difference, but if you run the same build again,
-# you won't get the same error. Unless someone can figure out what's
-# going on, we just have to keep re-running the build until it doesn't
-# happen.
-%global run_tests               1
-
-# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
-# WXAgg Agg Cairo PS PDF SVG
-%global backend                 TkAgg
-
-%if "%{backend}" == "TkAgg"
-%global backend_subpackage tk
+%if 0%{?fedora} >= 18
+%global with_python3            1
+%global basepy3dir              %(echo ../`basename %{py3dir}`)
 %else
-%  if "%{backend}" == "Qt4Agg"
-%global backend_subpackage qt4
-%  else
-%    if "%{backend}" == "Qt5Agg"
-%global backend_subpackage qt5
-%    else
-%      if "%{backend}" == "WXAgg"
-%global backend_subpackage wx
-%      endif
-%    endif
-%  endif
+%global with_python3            0
+%endif
+%global __provides_exclude_from	.*/site-packages/.*\\.so$
+%global with_html               1
+
+# On RHEL 7 onwards, don't build with wx:
+%if 0%{?rhel} >= 7
+%global with_wx 0
+%else
+%global with_wx 1
 %endif

-# https://fedorahosted.org/fpc/ticket/381
-%global with_bundled_fonts      1
-
-# Use the same directory of the main package for subpackage licence and docs
-%global _docdir_fmt %{name}
-
-#global rctag rc2
-
-# Updated test images for new FreeType.
-%global mpl_images_version 3.1.1
-
-# The version of FreeType in this Fedora branch.
-%global ftver 2.10.0

 Name:           python-matplotlib
-Version:        3.1.3
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Version:        1.2.0
+Release:        15%{?dist}
 Summary:        Python 2D plotting library
-# qt4_editor backend is MIT
-License:        Python and MIT
+Group:          Development/Libraries
+License:        Python
 URL:            http://matplotlib.org
-Source0:        https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}/matplotlib-%{version}%{?rctag}.tar.gz
+#Modified Sources to remove the one undistributable file
+#See generate-tarball.sh in fedora cvs repository for logic
+#sha1sum matplotlib-1.2.0-without-gpc.tar.gz
+#92ada4ef4e7374d67e46e30bfb08c3fed068d680  matplotlib-1.2.0-without-gpc.tar.gz
+Source0:        matplotlib-%{version}-without-gpc.tar.gz
 Source1:        setup.cfg

-# Because the qhull package stopped shipping pkgconfig files.
-# https://src.fedoraproject.org/rpms/qhull/pull-request/1
-Patch0001:      0001-Force-using-system-qhull.patch
+Patch0:         %{name}-noagg.patch
+Patch1:         %{name}-tk.patch
+# http://sourceforge.net/mailarchive/message.php?msg_id=30202451
+# https://github.com/matplotlib/matplotlib/pull/1666
+# https://bugzilla.redhat.com/show_bug.cgi?id=896182
+Patch2:         %{name}-fontconfig.patch

-# Don't attempt to download jQuery and jQuery UI
-Patch0002:      0001-Use-packaged-jquery-and-jquery-ui.patch
-
-# Fedora-specific patches; see:
-# https://github.com/fedora-python/matplotlib/tree/fedora-patches-v3.1.x
-# https://github.com/fedora-python/matplotlib/tree/fedora-patches-non-x86-v3.1.x
-# 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
-# Image tolerances for 32-bit systems: i686 armv7hl
-Patch1004:      0004-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
-
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  glibc-langpack-en
+BuildRequires:  agg-devel
 BuildRequires:  freetype-devel
+BuildRequires:  gtk2-devel
 BuildRequires:  libpng-devel
-BuildRequires:  qhull-devel
-BuildRequires:  texlive-cm
+BuildRequires:  numpy
+BuildRequires:  pycairo-devel
+BuildRequires:  pygtk2-devel
+BuildRequires:  pyparsing
+BuildRequires:  python-dateutil
+BuildRequires:  python2-devel
+BuildRequires:  pytz
 BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  zlib-devel
+Requires:       dejavu-sans-fonts
+Requires:       dvipng
+Requires:       numpy
+Requires:       pycairo
+Requires:       pygtk2
+Requires:       pyparsing
+Requires:       python-dateutil
+Requires:       pytz
+%if 0%{?fedora} >= 18
+Requires:	stix-math-fonts
+%else
+Requires:	stix-fonts
+%endif

 %description
 Matplotlib is a python 2D plotting library which produces publication
@@ -96,70 +74,75 @@ 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
-Summary:        Data used by python-matplotlib
-BuildArch:      noarch
-%if %{with_bundled_fonts}
-Requires:       python3-matplotlib-data-fonts = %{version}-%{release}
-%endif
-Obsoletes:      python-matplotlib-data < 3
-%{?python_provide:%python_provide python3-matplotlib-data}
+%package        qt4
+Summary:        Qt4 backend for python-matplotlib
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+BuildRequires:  PyQt4-devel
+Requires:       PyQt4

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

-%if %{with_bundled_fonts}
-%package -n python3-matplotlib-data-fonts
-Summary:        Fonts used by python-matplotlib
-# STIX and Computer Modern is OFL
-# DejaVu is Bitstream Vera and Public Domain
-License:        OFL and Bitstream Vera and Public Domain
-BuildArch:      noarch
-Requires:       python3-matplotlib-data = %{version}-%{release}
-Obsoletes:      python-matplotlib-data-fonts < 3
-%{?python_provide:%python_provide python3-matplotlib-data-fonts}
+%package        tk
+Summary:        Tk backend for python-matplotlib
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+BuildRequires:  tcl-devel
+BuildRequires:  tkinter
+BuildRequires:  tk-devel
+Requires:       tkinter

-%description -n python3-matplotlib-data-fonts
+%description    tk
 %{summary}
+
+%if %{with_wx}
+%package        wx
+Summary:        wxPython backend for python-matplotlib
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+BuildRequires:  wxPython-devel
+Requires:       wxPython
+
+%description    wx
+%{summary}
+%endif # with_wx
+
+%package        doc
+Summary:        Documentation files for python-matplotlib
+Group:          Documentation
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%if %{with_html}
+BuildRequires:  python-sphinx
+BuildRequires:  tex(latex)
+BuildRequires:  dvipng
 %endif

+%description    doc
+%{summary}
+
+%if %{with_python3}
 %package -n     python3-matplotlib
 Summary:        Python 2D plotting library
+Group:          Development/Libraries
 BuildRequires:  python3-cairo
-BuildRequires:  python3-cycler >= 0.10.0
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  python3-gobject
-BuildRequires:  python3-kiwisolver
 BuildRequires:  python3-numpy
-BuildRequires:  python3-pillow
 BuildRequires:  python3-pyparsing
 BuildRequires:  python3-pytz
-BuildRequires:  python3-sphinx
-Requires:       dejavu-sans-fonts
-Requires:       dvipng
-Requires:       python3-matplotlib-data = %{version}-%{release}
-Requires:       python3-cairo
-Requires:       python3-cycler >= 0.10.0
-Requires:       python3-dateutil
-Requires:       python3-kiwisolver
-Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
-%if %{run_tests}
-BuildRequires:  python3-pytest
-BuildRequires:  python3-pytest-rerunfailures
-BuildRequires:  python3-pytest-timeout
-BuildRequires:  python3-pytest-xdist
-%endif
+BuildRequires:  python3-six
 Requires:       python3-numpy
-Recommends:     python3-pillow
+Requires:       python3-cairo
 Requires:       python3-pyparsing
-%if !%{with_bundled_fonts}
-Requires:       stix-math-fonts
+Requires:       python3-dateutil
+Requires:       python3-pytz
+%if 0%{?fedora} >= 18
+Requires:	stix-math-fonts
 %else
-Provides:       bundled(stix-math-fonts)
+Requires:	stix-fonts
 %endif
-%{?python_provide:%python_provide python3-matplotlib}

 %description -n python3-matplotlib
 Matplotlib is a python 2D plotting library which produces publication
@@ -174,540 +157,175 @@ errorcharts, scatterplots, etc, with just a few lines of code.

 %package -n     python3-matplotlib-qt4
 Summary:        Qt4 backend for python3-matplotlib
-BuildRequires:  python3-PyQt4-devel
+Group:          Development/Libraries
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python3-matplotlib-qt5
+BuildRequires:  python3-PyQt4-devel
 Requires:       python3-PyQt4
-%{?python_provide:%python_provide python3-matplotlib-qt4}

 %description -n python3-matplotlib-qt4
 %{summary}

-%package -n     python3-matplotlib-qt5
-Summary:        Qt5 backend for python3-matplotlib
-BuildRequires:  python3-qt5
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python3-qt5
-%{?python_provide:%python_provide python3-matplotlib-qt5}
-
-%description -n python3-matplotlib-qt5
-%{summary}
-
-%package -n     python3-matplotlib-gtk3
-Summary:        GTK3 backend for python3-matplotlib
-# This should be converted to typelib(Gtk) when supported
-BuildRequires:  gtk3
-BuildRequires:  python3-gobject
-Requires:       gtk3%{?_isa}
-Requires:       python3-gobject%{?_isa}
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-matplotlib-gtk3}
-
-%description -n python3-matplotlib-gtk3
-%{summary}
-
 %package -n     python3-matplotlib-tk
 Summary:        Tk backend for python3-matplotlib
-BuildRequires:  python3-tkinter
+Group:          Development/Libraries
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
+BuildRequires:  python3-tkinter
 Requires:       python3-tkinter
-%{?python_provide:%python_provide python3-matplotlib-tk}

 %description -n python3-matplotlib-tk
 %{summary}
-
-%package -n     python3-matplotlib-wx
-Summary:        WX backend for python3-matplotlib
-BuildRequires:  python3-wxpython4
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-Requires:       python3-wxpython4
-%{?python_provide:%python_provide python3-matplotlib-wx}
-
-%description -n python3-matplotlib-wx
-%{summary}
-
-%package -n python3-matplotlib-doc
-Summary:        Documentation files for python-matplotlib
-%if %{with_html}
-BuildRequires:  dvipng
-BuildRequires:  graphviz
-BuildRequires:  python3-sphinx
-BuildRequires:  tex(latex)
-BuildRequires:  tex-preview
-BuildRequires:  js-jquery >= 3.2.1
-BuildRequires:  xstatic-jquery-ui-common
-Requires:       js-jquery >= 3.2.1
-Requires:       xstatic-jquery-ui-common
 %endif
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-matplotlib-doc}
-
-%description -n python3-matplotlib-doc
-%{summary}
-
-%package -n python3-matplotlib-test-data
-Summary:        Test data for python3-matplotlib
-Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-matplotlib-test-data}
-
-%description -n python3-matplotlib-test-data
-%{summary}
-

 %prep
-%autosetup -n matplotlib-%{version}%{?rctag} -N
-%patch0001 -p1
-
-%patch0002 -p1
-
-# 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
-%endif
-%ifarch aarch64 ppc64 ppc64le s390x
-%patch1005 -p1
-%endif
-%ifarch i686 armv7hl
-%patch1004 -p1
-%endif
-rm -r extern/libqhull
+%setup -q -n matplotlib-%{version}

 # Copy setup.cfg to the builddir
-cp -p %{SOURCE1} setup.cfg
+cp %{SOURCE1} .

-# Keep this until next version, and increment if changing from
-# USE_FONTCONFIG to False or True so that cache is regenerated
-# if updated from a version enabling fontconfig to one not
-# enabling it, or vice versa
-if [ %{version} = 1.4.3 ]; then
-    sed -i 's/\(__version__ = 200\)/\1.1/' lib/matplotlib/font_manager.py
-fi
+# Remove bundled libraries
+rm -r agg24 lib/matplotlib/pyparsing_py?.py
+
+# Remove references to bundled libraries
+%patch0 -p1 -b .noagg
+sed -i -e s/matplotlib\.pyparsing_py./pyparsing/g lib/matplotlib/*.py
+
+# Correct tcl/tk detection
+%patch1 -p1 -b .tk
+sed -i -e 's|@@libdir@@|%{_libdir}|' setupext.py

-%if !%{with_bundled_fonts}
 # Use fontconfig by default
-sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py
+%patch2 -p1 -b .fontconfig
+
+chmod -x lib/matplotlib/mpl-data/images/*.svg
+
+%if %{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
 %endif

-
 %build
-%set_build_flags
-export http_proxy=http://127.0.0.1/
-
-MPLCONFIGDIR=$PWD \
-  xvfb-run %{__python3} setup.py build
+xvfb-run %{__python2} setup.py build
 %if %{with_html}
 # Need to make built matplotlib libs available for the sphinx extensions:
 pushd doc
-    MPLCONFIGDIR=$PWD/.. \
-    PYTHONPATH=`realpath ../build/lib.linux*` \
-        %{__python3} make.py html
+    export PYTHONPATH=`realpath ../build/lib.linux*`
+    %{__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 '{}' \;

+%if %{with_python3}
+pushd %{py3dir}
+    xvfb-run %{__python3} setup.py build
+    # documentation cannot be built with python3 due to syntax errors
+    # and building with python 2 exits with cryptic error messages
+popd
+%endif
+
 %install
-export http_proxy=http://127.0.0.1/
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/mpl-data/fonts

-MPLCONFIGDIR=$PWD \
-    %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
-chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py
-mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
-mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data/matplotlibrc \
-   %{buildroot}%{_sysconfdir}
-mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \
-   %{buildroot}%{_datadir}/matplotlib
-%if !%{with_bundled_fonts}
-rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
+%if %{with_python3}
+pushd %{py3dir}
+    %{__python3} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+    chmod +x $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/dates.py
+    rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/mpl-data/fonts
+    rm -f $RPM_BUILD_ROOT%{python3_sitearch}/six.py
+popd
 %endif

-%if %{run_tests}
-%check
-# These files confuse pytest, and we want to test the installed copy.
-rm -rf build*/
+%files
+%doc README.txt
+%doc lib/dateutil_py2/LICENSE
+%doc lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
+%doc lib/pytz/LICENSE.txt
+%doc CHANGELOG
+%doc CXX
+%doc INSTALL
+%doc PKG-INFO
+%doc TODO
+%{python_sitearch}/*egg-info
+%{python_sitearch}/matplotlib/
+%{python_sitearch}/mpl_toolkits/
+%{python_sitearch}/pylab.py*
+%exclude %{python_sitearch}/matplotlib/backends/backend_qt4.*
+%exclude %{python_sitearch}/matplotlib/backends/backend_qt4agg.*
+%exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
+%exclude %{python_sitearch}/matplotlib/backends/tkagg.*
+%exclude %{python_sitearch}/matplotlib/backends/_tkagg.so
+%exclude %{python_sitearch}/matplotlib/backends/backend_wx.*
+%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.*

-export http_proxy=http://127.0.0.1/
-# Skips:
-#  * 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 \
-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.
-MPLCONFIGDIR=$PWD \
-MATPLOTLIBRC=%{buildroot}%{_sysconfdir}/matplotlibrc \
-PYTHONPATH=%{buildroot}%{python3_sitearch} \
-PYTHONDONTWRITEBYTECODE=1 \
-     xvfb-run -a -s "-screen 0 640x480x24" \
-         %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
-             -m 'not network' -k 'Qt5Agg'
-%endif
+%files qt4
+%{python_sitearch}/matplotlib/backends/backend_qt4.*
+%{python_sitearch}/matplotlib/backends/backend_qt4agg.*

-%files -n python3-matplotlib-data
-%{_sysconfdir}/matplotlibrc
-%{_datadir}/matplotlib/mpl-data/
-%if %{with_bundled_fonts}
-%exclude %{_datadir}/matplotlib/mpl-data/fonts/
-%endif
+%files tk
+%{python_sitearch}/matplotlib/backends/backend_tkagg.py*
+%{python_sitearch}/matplotlib/backends/tkagg.py*
+%{python_sitearch}/matplotlib/backends/_tkagg.so

-%if %{with_bundled_fonts}
-%files -n python3-matplotlib-data-fonts
-%{_datadir}/matplotlib/mpl-data/fonts/
-%endif
+%if %{with_wx}
+%files wx
+%{python_sitearch}/matplotlib/backends/backend_wx.*
+%{python_sitearch}/matplotlib/backends/backend_wxagg.*
+%endif # with_wx

-%files -n python3-matplotlib-doc
+%files doc
 %doc examples
 %if %{with_html}
 %doc doc/build/html/*
 %endif

+%if %{with_python3}
 %files -n python3-matplotlib
-%license LICENSE/
-%doc README.rst
+%doc %{basepy3dir}/README.txt
+%doc %{basepy3dir}/lib/dateutil_py3/LICENSE
+%doc %{basepy3dir}/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
+%doc %{basepy3dir}/lib/pytz/LICENSE.txt
+%doc %{basepy3dir}/CHANGELOG
+%doc %{basepy3dir}/CXX
+%doc %{basepy3dir}/INSTALL
+%doc %{basepy3dir}/PKG-INFO
+%doc %{basepy3dir}/TODO
 %{python3_sitearch}/*egg-info
-%{python3_sitearch}/matplotlib-*-nspkg.pth
 %{python3_sitearch}/matplotlib/
-%exclude %{python3_sitearch}/matplotlib/tests/baseline_images/*
 %{python3_sitearch}/mpl_toolkits/
-%exclude %{python3_sitearch}/mpl_toolkits/tests/baseline_images/*
 %{python3_sitearch}/pylab.py*
 %{python3_sitearch}/__pycache__/*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*.py
-%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4*
-#exclude #{python3_sitearch}/matplotlib/backends/backend_qt5*.py
-#exclude #{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5*
-%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py
-%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_qt4.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/tkagg.*
 %exclude %{python3_sitearch}/matplotlib/backends/__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
-%{python3_sitearch}/matplotlib/tests/baseline_images/
-%{python3_sitearch}/mpl_toolkits/tests/baseline_images/
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_tkagg.*

 %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.*
-
-%files -n python3-matplotlib-gtk3
-%{python3_sitearch}/matplotlib/backends/backend_gtk*.py
-%{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.*
-
+%endif

 %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
-
-* Fri Jul 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-4
- Don't use unversioned Python in build (#1605766)
- Add missing texlive-cm BR
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.2-3
- Rebuilt for Python 3.7
-
-* Tue Apr 17 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-2
- Remove bytecode produced by pytest
- Add python?-matplotlib-test-data subpackages
-
-* Sat Mar 31 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.2-1
- Update to latest release
- Run tests in parallel
-
-* Tue Mar 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-3
- Cleanup spec file of old conditionals
- Use more python2- dependencies
-
-* Mon Feb 05 2018 Karsten Hopp <karsten@redhat.com> - 2.1.2-2
- update and fix spec file conditionals
-
-* Sun Jan 21 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-1
- Update to latest release
-
-* Sun Dec 10 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.1-1
- Update to latest release
-
-* Mon Oct 16 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.0-1
- Update to latest release
-
-* Thu Sep 28 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.2-1
- Update to latest release
-
-* Thu Sep 28 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.1-1
- Update to latest release
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2.0.0-3
- Fix NVR
-
-* Mon Mar 06 2017 Thomas Spura <tomspur@fedoraproject.org> - 2.0.0-2.2
- Remove copyrighted file from tarball (gh-8034)
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Jan 25 2017 Dan Horák <dan[at]danny.cz> - 2.0.0-2
- Apply the 'aarch64' test tolerance patch on s390(x) also
-
-* Fri Jan 20 2017 Orion Poplawski <orion@cora.nwra.com> - 2.0.0-1
- Update to 2.0.0 final
-
-* Tue Jan 10 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.7.rc2
- Update to 2.0.0rc2
- Fix more big-endian integer issues
- Apply the 'aarch64' test tolerance patch on ppc64 also (it's affected by same issues)
- Tweak the 'i686' test tolerance patch a bit (some errors are gone, some new ones)
- Re-enable test suite for all arches
- Note a remaining quasi-random test issue that causes build to fail sometimes
-
-* Mon Jan 09 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.6.b4
- Fix another integer type issue which caused more issues on ppc64
-
-* Sun Jan 08 2017 Adam Williamson <awilliam@redhat.com> - 2.0.0-0.5.b4
- Fix int type conversion error that broke text rendering on ppc64 (#1411070)
-
-* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 2.0.0-0.4.b4
- Rebuild for Python 3.6
-
-* Mon Oct 24 2016 Dan Horák <dan[at]danny.cz> - 2.0.0-0.3.b4
- disable tests on some alt-arches to unblock depending builds
-
-* Mon Sep 26 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.0.0-0.2.b4
- add missing runtime dependencies for python2 package
-
-* Sat Sep 10 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.0.0-0.1.b4
- Update to 2.0.0b4
- Drop upstreamed or obsolete patches
- python-cycler >= 0.10.0 is required
- move around Requires and BRs and sort more or less alphabetically
- don't ship baseline images for tests (like Debian)
- Require stix fonts only when they're not bundled
- disable HTML doc building for bootstrapping 2.0.x series
- relax image rendering tests tolerance due to freetype version differences
- disable some failing tests on aarch64 for now
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-0.2.rc2
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Fri Jun 03 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-7
- Update to 1.5.2rc2.
- Drop wrong hunk from use-system-six patch.
- Patch new qhull paths on F25+ instead of using sed.
- Rebase failing tests patch.
-
-* Mon May 23 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-6
- Upstream no longer ships non-free images, use pristine source.
-
-* Wed May 18 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.5.1-5
- Unbundle python-six (#1336740).
- Run tests (and temporarily disable failing ones).
- Use upstream-recommended way of running tests in parallel.
- python2-cycler and -mock are required for running tests.
-
-* Sat Apr 30 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.5.1-4
- Rebuild for qhull-2015.2-1.
- Reflect qhull_a.h's location having changed.
-
-* Wed Apr 6 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-3
- Add requires python-cycler
-
-* Tue Apr 05 2016 Jon Ciesla <limburgher@gmail.com> - 1.5.1-2
- Drop agg-devel BR, fix sphinx build with python*cycler BR
-
-* Mon Apr 04 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.5.1-1
- update to 1.5.1 (#1276806)
- Add missing requires of dvipng to python3-matplotlib (#1270202)
- use bundled agg (#1276806)
- Drop cxx patch (was dropped upstream)
- Regenerate search path patch2
-
-* Mon Apr 04 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-13
- Require the qt5 subpackage from the qt4 subpackage (#1219556)
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jan 12 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-11
- Fix another requires of the main package
-
-* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-10
- Fix requiring the correct backend from the main package
-
-* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-9
- regenerate tarball to exclude lena image (#1295174)
-
-* Sun Nov 15 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-8
- Pick upstream patch for fixing the gdk backend #1231748
- Add python2 subpackages and use python_provide
-
-* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-7
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.4.3-5
- Rebuilt for GCC 5 C++11 ABI change
-
-* Wed Feb 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-4
- Split out python-matplotlib-gtk, python-matplotlib-gtk3,
-  python3-matplotlib-gtk3 subpackages (#1067373)
- Add missing requirements on gtk
-
-* Tue Feb 24 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-3
- Use %%license, add skimage to build requirements
-
-* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-2
- Disable Qt5 backend on Fedora <21 and RHEL
-
-* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-1
- New upstream release (#1134007)
- Add Qt5 backend
-
-* Tue Jan 13 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.2-1
- Bump to new upstream release
- Add qhull-devel to BR
- Add six to Requires
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
-
-* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
-
-* Tue Feb 11 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-3
- Make TkAgg the default backend
- Remove python2 dependency from -data subpackage
-
-* Mon Jan 27 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-2
- Correct environment for and enable %%check
- Install system wide matplotlibrc under /etc
- Do not duplicate mpl-data for python2 and python3 packages
- Conditionally bundle data fonts (https://fedorahosted.org/fpc/ticket/381)
-
-* Sat Jan 25 2014 Thomas Spura <tomspur@fedoraproject.org> - 1.3.1-1
- update to 1.3.1
- use GTKAgg as backend (#1030396, #982793, #1049624)
- use fontconfig
- add %%check for local testing (testing requires a display)
-
-* Wed Aug  7 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.3.0-1
- update to new version
- use xz to compress sources
- drop fontconfig patch (upstream)
- drop tk patch (upstream solved build issue differently)
- redo use system agg patch
- delete bundled python-pycxx headers
- fix requires of python3-matplotlib-qt (fixes #988412)
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Sat Jan 25 2014 Thomas Spura <tomspur@fedoraproject.org> - 1.2.0-15
+- use GTKAgg backend (#982793)
+- R python3-matplotlib not python-matplotlib (#988412)

 * Mon Jun 10 2013 Jon Ciesla <limburgher@gmail.com> - 1.2.0-14
 - agg rebuild.
@@ -813,7 +431,7 @@ PYTHONDONTWRITEBYTECODE=1 \
 - fix build with new Tkinter which doesn't return an expected value in __version__

 * Thu Sep 15 2011 Jef Spaleta <jspaleta@fedoraproject.org> - 1.0.1-13
- apply upstream bugfix for timezone formatting (Bug 735677)
+- apply upstream bugfix for timezone formatting (Bug 735677) 

 * Fri May 20 2011 Orion Poplawski <orion@cora.nwra.com> - 1.0.1-12
 - Add Requires dvipng (Bug 684836)
@@ -871,20 +489,20 @@ PYTHONDONTWRITEBYTECODE=1 \
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild

 * Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1
- New upstream release
- Remove undistributable file from bundled agg library
+- New upstream release  
+- Remove undistributable file from bundled agg library 

 * Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1
- New upstream release
+- New upstream release  

 * Thu May 27 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-4
- Upstream patch to fix deprecated gtk tooltip warning.
+- Upstream patch to fix deprecated gtk tooltip warning.  

 * Mon Apr 12 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-2
- Bump to rebuild against numpy 1.3
+- Bump to rebuild against numpy 1.3  

 * Thu Apr 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-1
- Bump to rebuild against numpy 1.4.0
+- Bump to rebuild against numpy 1.4.0  

 * Fri Dec 11 2009 Jon Ciesla <limb@jcomserv.net> - 0.99.1.2
 - Update to 0.99.1.2
@@ -945,7 +563,7 @@ PYTHONDONTWRITEBYTECODE=1 \
 - Rebuild for Tcl/Tk downgrade

 * Sat Feb 10 2007 Jef Spaleta <jspaleta@gmail.com> 0.90.0-2
- Release bump for rebuild against new tk
+- Release bump for rebuild against new tk 

 * Fri Feb 09 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-1
 - Update to 0.90.0
@@ -1007,7 +625,7 @@ PYTHONDONTWRITEBYTECODE=1 \
 - New upstream version 0.84

 * Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-3
- bump release
+- bump release 

 * Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-2
 - Add Requires: python-numeric, pytz, python-dateutil
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,2 @@
-[packages]
-tests = True
-toolkits = True
-toolkits_tests = True
+[rc_options]
+backend = GTKAgg
--- a/3
+++ b/3
@@ -1,2 +1 @@
-SHA512 (matplotlib-3.1.3.tar.gz) = d233a18449eac4c42ecc485d0df0c15e1e306f3945e5476b11b715d6bc190ca6f1c22e7d4b16d6c93c8a569e1c43b68b583339f0921f237a9920c7369854a09e
-SHA512 (matplotlib-3.1.1-with-freetype-2.10.0.tar.gz) = 257546b047ff79302b616f1d37caa028a7b9abc1682cf10861e1347a3db9f437967abe24e11aee898ae11c6f163939d48bc5aeaec2894d6472b4326f8edaed8b
+2add984c264ecdfc4a212f914736b78c  matplotlib-1.2.0-without-gpc.tar.gz
Author	SHA1	Message	Date
Thomas Spura	9f31e58569	Also bump the release	2014-01-25 17:22:02 +01:00
Thomas Spura	109cf25bcd	Use GTKAgg backend and correct requires - use GTKAgg backend (#982793) - R python3-matplotlib not python-matplotlib (#988412)	2014-01-25 17:20:39 +01:00