From e6f35913404364cee08a42555f0d016e3612c2c9 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 3 Mar 2020 23:05:13 -0500
Subject: [PATCH] Update to 3.2.0.

---
 .gitignore                                    |   4 +
 ...-env-override-in-WebAgg-backend-test.patch |  36 --
 ...agg-test-if-tornado-is-not-available.patch |  25 -
 0001-Use-packaged-jquery-and-jquery-ui.patch  |  59 +-
 ...ed-attribute-to-check-pillow-version.patch |  27 -
 0001-matplotlibrc-path-search-fix.patch       |  74 +--
 ...sion-to-2.10.1-and-update-tolerances.patch |  50 +-
 ...ase-tolerances-for-non-x86_64-arches.patch |  34 +-
 ...e-some-tolerances-for-32-bit-systems.patch | 543 +++++++++---------
 ...e-some-tolerances-for-non-x86-arches.patch | 193 +++----
 python-matplotlib.spec                        |  62 +-
 sources                                       |   4 +-
 12 files changed, 500 insertions(+), 611 deletions(-)
 delete mode 100644 0001-Fix-env-override-in-WebAgg-backend-test.patch
 delete mode 100644 0001-Skip-webagg-test-if-tornado-is-not-available.patch
 delete mode 100644 0001-Use-supported-attribute-to-check-pillow-version.patch
 rename 0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch => 0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch (72%)

diff --git a/.gitignore b/.gitignore
index e5b0831..2a65cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,7 @@ matplotlib-1.0.0-without-gpc.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.2.0rc3.tar.gz
+/matplotlib-3.2.0rc3-with-freetype-2.10.1.tar.gz
+/matplotlib-3.2.0.tar.gz
+/matplotlib-3.2.0-with-freetype-2.10.1.tar.gz
diff --git a/0001-Fix-env-override-in-WebAgg-backend-test.patch b/0001-Fix-env-override-in-WebAgg-backend-test.patch
deleted file mode 100644
index e14af33..0000000
--- a/0001-Fix-env-override-in-WebAgg-backend-test.patch
+++ /dev/null
@@ -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
-
diff --git a/0001-Skip-webagg-test-if-tornado-is-not-available.patch b/0001-Skip-webagg-test-if-tornado-is-not-available.patch
deleted file mode 100644
index 09d7347..0000000
--- a/0001-Skip-webagg-test-if-tornado-is-not-available.patch
+++ /dev/null
@@ -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
-
diff --git a/0001-Use-packaged-jquery-and-jquery-ui.patch b/0001-Use-packaged-jquery-and-jquery-ui.patch
index 6f9c17f..92ccaf2 100644
--- a/0001-Use-packaged-jquery-and-jquery-ui.patch
+++ b/0001-Use-packaged-jquery-and-jquery-ui.patch
@@ -1,14 +1,14 @@
-From c2af74bf18d46d03ec34bfda32afe1a99511ac9f Mon Sep 17 00:00:00 2001
+From 0ffab3ff58bee5346b9443a8b769d9786aba3b26 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Sat, 2 Mar 2019 18:18:29 -0500
 Subject: [PATCH] Use packaged jquery and jquery-ui.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
- .../backends/web_backend/all_figures.html     |  6 +-
- .../backends/web_backend/single_figure.html   |  6 +-
- setup.py                                      | 56 -------------------
- 3 files changed, 6 insertions(+), 62 deletions(-)
+ .../backends/web_backend/all_figures.html     |  6 +--
+ .../backends/web_backend/single_figure.html   |  6 +--
+ setup.py                                      | 53 -------------------
+ 3 files changed, 6 insertions(+), 59 deletions(-)
 
 diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html
 index 41f48dc6d..69097eb4f 100644
@@ -45,45 +45,42 @@ index 4d5a366fb..c11c86618 100644
      <script src="{{ prefix }}/js/mpl.js"></script>
      <script>
 diff --git a/setup.py b/setup.py
-index adabf1753..57d6b91b4 100644
+index 760e84af1..2b184749f 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -27,8 +27,6 @@ from zipfile import ZipFile
+@@ -26,8 +26,6 @@ from zipfile import ZipFile
  
- from setuptools import setup, Extension
+ from setuptools import setup, find_packages, 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
+@@ -115,57 +113,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)
+-    sha = "f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d"
+-    name = Path(url).stem
+-    if (dest / name).exists():
+-        return
+-    # If we are installing from an sdist, use the already downloaded jquery-ui.
+-    sdist_src = Path("lib/matplotlib/backends/web_backend", name)
+-    if sdist_src.exists():
+-        shutil.copytree(sdist_src, dest / name)
+-        return
+-    if not (dest / name).exists():
+-        dest.mkdir(parents=True, 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))
+-            raise IOError(f"Failed to download jquery-ui.  Please download "
+-                          f"{url} and extract it to {dest}.")
 -        with ZipFile(buff) as zf:
 -            zf.extractall(dest)
 -
@@ -91,23 +88,23 @@ index adabf1753..57d6b91b4 100644
 -# 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)
+-        super().make_release_tree(base_dir, files)
 -        _download_jquery_to(
--            os.path.join(base_dir, "lib/matplotlib/backends/web_backend/"))
+-            Path(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()
+-        super().run()
 -        _download_jquery_to(
--            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
+-            Path(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/")
+-        super().run()
+-        _download_jquery_to(Path("lib/matplotlib/backends/web_backend/"))
 -
 -
 -cmdclass['sdist'] = sdist_with_jquery
diff --git a/0001-Use-supported-attribute-to-check-pillow-version.patch b/0001-Use-supported-attribute-to-check-pillow-version.patch
deleted file mode 100644
index 6639aac..0000000
--- a/0001-Use-supported-attribute-to-check-pillow-version.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3369e3bc24f98f430593a5d15d8e6d6deb14356e Mon Sep 17 00:00:00 2001
-From: Thomas A Caswell <tcaswell@gmail.com>
-Date: Fri, 3 Jan 2020 20:24:07 -0500
-Subject: [PATCH] FIX: use supported attribute to check pillow version
-
-the PILLOW_VERSION attribute was deprecated in pillow 5.2 and removed
-in pillow 7.0.  The __version__ attribute is present in the minimum
-version we check (3.4).
-
-closes #16083
----
- lib/matplotlib/backend_bases.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
-index 5f73911670d..650446cbdb2 100644
---- a/lib/matplotlib/backend_bases.py
-+++ b/lib/matplotlib/backend_bases.py
-@@ -54,7 +54,7 @@
- from matplotlib.path import Path
- 
- try:
--    from PIL import PILLOW_VERSION
-+    from PIL import __version__ as PILLOW_VERSION
-     from distutils.version import LooseVersion
-     if LooseVersion(PILLOW_VERSION) >= "3.4":
-         _has_pil = True
diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch
index 6f58cf1..8c93de1 100644
--- a/0001-matplotlibrc-path-search-fix.patch
+++ b/0001-matplotlibrc-path-search-fix.patch
@@ -1,23 +1,34 @@
-From 7a2146f4de31667bf977ba11598078f76beaf89c Mon Sep 17 00:00:00 2001
+From 4fa2feb3b74904723c038c80303cddb52b68718d 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(-)
+ lib/matplotlib/__init__.py            | 30 ++++-----------------------
+ lib/matplotlib/tests/test_rcparams.py | 15 ++++++++++----
+ 2 files changed, 15 insertions(+), 30 deletions(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 825303171..7a4115491 100644
+index c4dba5f29..c56f5ca14 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -624,18 +624,8 @@ def _get_data_path():
+@@ -631,32 +631,11 @@ def _get_data_path():
+             "3.1", name="MATPLOTLIBDATA", obj_type="environment variable")
          return path
  
-     def get_candidate_paths():
--        yield Path(__file__).with_name('mpl-data')
+-    path = Path(__file__).with_name("mpl-data")
++    path = (Path(__file__).parent.parent.parent.parent.parent /
++            'share/matplotlib/mpl-data')
+     if path.is_dir():
+         return str(path)
+ 
+-    cbook.warn_deprecated(
+-        "3.2", message="Matplotlib installs where the data is not in the "
+-        "mpl-data subdirectory of the package are deprecated since %(since)s "
+-        "and support for them will be removed %(removal)s.")
+-
+-    def get_candidate_paths():
 -        # setuptools' namespace_packages may hijack this init file
 -        # so need to try something known to be in Matplotlib, not basemap.
 -        import matplotlib.afm
@@ -29,22 +40,25 @@ index 825303171..7a4115491 100644
 -            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():
+-            return str(path)
+-
+     raise RuntimeError('Could not find the matplotlib data files')
  
-     for path in get_candidate_paths():
-         if path.is_dir():
-@@ -678,8 +668,7 @@ def matplotlib_fname():
+ 
+@@ -694,8 +673,7 @@ def matplotlib_fname():
            is not defined)
      - On other platforms,
-         - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
+       - ``$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():
+@@ -708,7 +686,7 @@ def matplotlib_fname():
              yield matplotlibrc
              yield os.path.join(matplotlibrc, 'matplotlibrc')
          yield os.path.join(get_configdir(), 'matplotlibrc')
@@ -54,18 +68,10 @@ index 825303171..7a4115491 100644
      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
+index 87dfbeceb..54885da47 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():
+@@ -460,10 +460,17 @@ def test_rcparams_reset_after_fail():
          assert mpl.rcParams['text.usetex'] is False
  
  
@@ -80,13 +86,12 @@ index d8fe73ceb..c3aeb58ef 100644
 +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()
+-    with cbook._get_data_path('matplotlibrc').open() as file:
++    with mplrc.open() as file:
+         rclines = file.readlines()
      missing = {}
      for k, v in mpl.defaultParams.items():
-@@ -484,11 +491,10 @@ def test_if_rctemplate_is_up_to_date():
+@@ -483,10 +490,10 @@ def test_if_rctemplate_is_up_to_date():
                           .format(missing.items()))
  
  
@@ -94,12 +99,11 @@ index d8fe73ceb..c3aeb58ef 100644
 +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()
+-    with cbook._get_data_path('matplotlibrc').open() as file:
++    with mplrc.open() as file:
+         rclines = file.readlines()
      newlines = []
      for line in rclines:
 -- 
-2.21.0
+2.21.1
 
diff --git a/0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch b/0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch
similarity index 72%
rename from 0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch
rename to 0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch
index b4447c3..7bf0874 100644
--- a/0002-Set-FreeType-version-to-2.10.0-and-update-tolerances.patch
+++ b/0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch
@@ -1,7 +1,7 @@
-From 53e911c1eb6b840036acfd6b630439bc55b4bdca Mon Sep 17 00:00:00 2001
+From 1a08b9ab19b817d9deaa7a03ed29a1452fafe3e4 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.
+Date: Fri, 14 Feb 2020 06:05:42 -0500
+Subject: [PATCH 2/4] Set FreeType version to 2.10.1 and update tolerances.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
@@ -9,27 +9,27 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  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(-)
+ setupext.py                                    |  2 +-
+ 5 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
-index 7a4115491..1bf9d3e03 100644
+index c56f5ca14..11eee4fcf 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
-@@ -1361,7 +1361,7 @@ def _init_tests():
- 
+@@ -1292,7 +1292,7 @@ default_test_modules = [
+ 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'
++    LOCAL_FREETYPE_VERSION = '2.10.1'
  
      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 8ff5ac45d..25f5695f3 100644
+index 5edb4f24b..ba9c2005b 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
-@@ -6198,7 +6198,7 @@ def test_normal_axes():
+@@ -6400,7 +6400,7 @@ def test_normal_axes():
      ]
      for nn, b in enumerate(bbaxis):
          targetbb = mtransforms.Bbox.from_bounds(*target[nn])
@@ -38,7 +38,7 @@ index 8ff5ac45d..25f5695f3 100644
  
      target = [
          [150.0, 119.999, 930.0, 11.111],
-@@ -6216,7 +6216,7 @@ def test_normal_axes():
+@@ -6418,7 +6418,7 @@ def test_normal_axes():
  
      target = [85.5138, 75.88888, 1021.11, 1017.11]
      targetbb = mtransforms.Bbox.from_bounds(*target)
@@ -47,7 +47,7 @@ index 8ff5ac45d..25f5695f3 100644
  
      # test that get_position roundtrips to get_window_extent
      axbb = ax.get_position().transformed(fig.transFigure).bounds
-@@ -6341,7 +6341,7 @@ def test_get_tightbbox_polar():
+@@ -6543,7 +6543,7 @@ def test_get_tightbbox_polar():
      fig.canvas.draw()
      bb = ax.get_tightbbox(fig.canvas.get_renderer())
      assert_allclose(bb.extents,
@@ -57,20 +57,20 @@ index 8ff5ac45d..25f5695f3 100644
  
  @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
+index c91037eae..75311e70e 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -416,4 +416,4 @@ def test_hidden_axes():
+@@ -399,4 +399,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
+index 377dfb649..6e6d8afe2 100644
 --- a/lib/matplotlib/tests/test_tightlayout.py
 +++ b/lib/matplotlib/tests/test_tightlayout.py
-@@ -186,12 +186,12 @@ def test_outward_ticks():
+@@ -172,12 +172,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.
@@ -89,26 +89,18 @@ index 0b9469cb8..7963b82ff 100644
  
  
 diff --git a/setupext.py b/setupext.py
-index 3e8b382cc..2a3fc3ee7 100644
+index 09cd6bbd7..c3c96d4e0 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
+@@ -152,7 +152,7 @@ _freetype_hashes = {
  # 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_VERSION = '2.10.1'
  LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown')
  
  
 -- 
-2.21.0
+2.21.1
 
diff --git a/0003-Increase-tolerances-for-non-x86_64-arches.patch b/0003-Increase-tolerances-for-non-x86_64-arches.patch
index 7a90cb5..479e507 100644
--- a/0003-Increase-tolerances-for-non-x86_64-arches.patch
+++ b/0003-Increase-tolerances-for-non-x86_64-arches.patch
@@ -1,40 +1,42 @@
-From b3b02bdfe6db629bc68a87a472b5f88d988bf5f2 Mon Sep 17 00:00:00 2001
+From 743d1b3370b37c6e4798c941867a43d1118f771b 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/matplotlib/tests/test_streamplot.py   | 4 ++--
  lib/mpl_toolkits/tests/test_axes_grid1.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
-index a712680cd..6007c9b9a 100644
+index d2218f6f2..1afc60543 100644
 --- a/lib/matplotlib/tests/test_streamplot.py
 +++ b/lib/matplotlib/tests/test_streamplot.py
-@@ -61,7 +61,7 @@ def test_linewidth():
+@@ -63,8 +63,8 @@ def test_linewidth():
+                   linewidth=lw)
  
  
- @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')
+-@image_comparison(['streamplot_masks_and_nans'],
+-                  remove_text=True, style='mpl20', tol=0.04 if on_win else 0)
++@image_comparison(baseline_images=['streamplot_masks_and_nans'],
++                  remove_text=True, style='mpl20', tol=0.04 if on_win else .01)
  def test_masks_and_nans():
      X, Y, U, V = velocity_field()
+     mask = np.zeros(U.shape, dtype=bool)
 diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
-index 95b1ae5a3..e054196b4 100644
+index 9ed9a9280..56a3bd14a 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():
+@@ -343,7 +343,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'])
+ @image_comparison(['anchored_direction_arrows.png'],
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.02)
  def test_anchored_direction_arrows():
      fig, ax = plt.subplots()
+     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
 -- 
-2.21.0
+2.21.1
 
diff --git a/0004-Increase-some-tolerances-for-32-bit-systems.patch b/0004-Increase-some-tolerances-for-32-bit-systems.patch
index 0383eee..01b052c 100644
--- a/0004-Increase-some-tolerances-for-32-bit-systems.patch
+++ b/0004-Increase-some-tolerances-for-32-bit-systems.patch
@@ -1,4 +1,4 @@
-From fb6a3a64fe6f5b314c1c54bbef745b78ee512417 Mon Sep 17 00:00:00 2001
+From ce08fe59398bf0bb68ca90fa4c1bf992613f5d19 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.
@@ -6,16 +6,16 @@ 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_artist.py           |  2 +-
+ lib/matplotlib/tests/test_axes.py             | 48 +++++++++----------
  lib/matplotlib/tests/test_collections.py      |  2 +-
- lib/matplotlib/tests/test_colorbar.py         | 11 +++--
+ lib/matplotlib/tests/test_colorbar.py         | 10 ++--
  .../tests/test_constrainedlayout.py           |  2 +-
- lib/matplotlib/tests/test_contour.py          |  8 +--
- lib/matplotlib/tests/test_cycles.py           |  3 --
+ lib/matplotlib/tests/test_contour.py          |  6 +--
+ lib/matplotlib/tests/test_cycles.py           |  9 ++--
  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_legend.py           |  9 ++--
  lib/matplotlib/tests/test_mathtext.py         |  4 +-
  lib/matplotlib/tests/test_patches.py          |  3 +-
  lib/matplotlib/tests/test_patheffects.py      |  2 +-
@@ -23,17 +23,17 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  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 -
+ lib/matplotlib/tests/test_units.py            |  3 +-
  .../tests/test_axisartist_floating_axes.py    |  4 +-
- ...test_axisartist_grid_helper_curvelinear.py |  6 +--
+ ...test_axisartist_grid_helper_curvelinear.py |  7 ++-
  lib/mpl_toolkits/tests/test_mplot3d.py        |  4 +-
- 22 files changed, 59 insertions(+), 63 deletions(-)
+ 22 files changed, 60 insertions(+), 70 deletions(-)
 
 diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
-index 04d5bcda8..70de0263b 100644
+index 7965d45e4..6f5022ffa 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,
+@@ -268,7 +268,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol,
      return decorator
  
  
@@ -43,432 +43,437 @@ index 04d5bcda8..70de0263b 100644
                       savefig_kwarg=None,
                       # Default of mpl_test_settings fixture and cleanup too.
 diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
-index 9bf15d0b9..5339dd2eb 100644
+index a598e822d..becc9b46d 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():
+@@ -94,7 +94,7 @@ 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)
+-@image_comparison(["clip_path_clipping"], remove_text=True)
++@image_comparison(["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 25f5695f3..f6ddc4e95 100644
+index ba9c2005b..6bf56374c 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
-@@ -562,7 +562,7 @@ def test_single_point():
+@@ -563,7 +563,7 @@ def test_single_point():
+     plt.plot('b', 'b', 'o', data=data)
  
  
- @image_comparison(baseline_images=['single_date'], extensions=['png'],
--        style='mpl20')
-+        style='mpl20', tol=1.97)
+-@image_comparison(['single_date.png'], style='mpl20')
++@image_comparison(['single_date.png'], style='mpl20', tol=1.97)
  def test_single_date():
-     time1 = [721964.0]
-     data1 = [-65.54]
-@@ -1079,7 +1079,7 @@ def test_fill_between_interpolate():
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -1093,7 +1093,7 @@ def test_fill_between_interpolate():
  
  
- @image_comparison(baseline_images=['fill_between_interpolate_decreasing'],
+ @image_comparison(['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():
+@@ -1208,7 +1208,7 @@ def test_pcolormesh_alpha():
  
  
- @image_comparison(baseline_images=['pcolormesh_datetime_axis'],
--                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.19)
+ @image_comparison(['pcolormesh_datetime_axis.png'],
+-                  remove_text=False, style='mpl20')
++                  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():
+@@ -1234,7 +1234,7 @@ def test_pcolormesh_datetime_axis():
  
  
- @image_comparison(baseline_images=['pcolor_datetime_axis'],
--                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.19)
+ @image_comparison(['pcolor_datetime_axis.png'],
+-                  remove_text=False, style='mpl20')
++                  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():
+@@ -1290,7 +1290,8 @@ def test_canonical():
+     ax.plot([1, 2, 3])
  
  
- @image_comparison(baseline_images=['arc_angles'], remove_text=True,
--                  style='default', extensions=['png'])
-+                  style='default', extensions=['png'], tol=0.17)
+-@image_comparison(['arc_angles.png'], remove_text=True, style='default')
++@image_comparison(['arc_angles.png'], remove_text=True, style='default',
++                  tol=0.17)
  def test_arc_angles():
      from matplotlib import patches
      # Ellipse parameters
-@@ -2635,7 +2637,7 @@ def test_boxplot_mod_artist_after_plotting():
+@@ -2749,7 +2750,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)
+ 
+ @image_comparison(['violinplot_vert_baseline.png',
+-                   'violinplot_vert_baseline.png'])
++                   'violinplot_vert_baseline.png'], tol=0.24)
  def test_vert_violinplot_baseline():
      # First 9 digits of frac(sqrt(2))
      np.random.seed(414213562)
-@@ -2653,7 +2655,7 @@ def test_vert_violinplot_baseline():
+@@ -2766,7 +2767,7 @@ def test_vert_violinplot_baseline():
+                   showmedians=0, data=data)
  
  
- @image_comparison(baseline_images=['violinplot_vert_showmeans'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
+-@image_comparison(['violinplot_vert_showmeans.png'])
++@image_comparison(['violinplot_vert_showmeans.png'], tol=0.23)
  def test_vert_violinplot_showmeans():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(3))
-@@ -2664,7 +2666,7 @@ def test_vert_violinplot_showmeans():
+@@ -2776,7 +2777,7 @@ def test_vert_violinplot_showmeans():
+                   showmedians=0)
  
  
- @image_comparison(baseline_images=['violinplot_vert_showextrema'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
+-@image_comparison(['violinplot_vert_showextrema.png'])
++@image_comparison(['violinplot_vert_showextrema.png'], tol=0.23)
  def test_vert_violinplot_showextrema():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(5))
-@@ -2675,7 +2677,7 @@ def test_vert_violinplot_showextrema():
+@@ -2786,7 +2787,7 @@ def test_vert_violinplot_showextrema():
+                   showmedians=0)
  
  
- @image_comparison(baseline_images=['violinplot_vert_showmedians'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
+-@image_comparison(['violinplot_vert_showmedians.png'])
++@image_comparison(['violinplot_vert_showmedians.png'], tol=0.23)
  def test_vert_violinplot_showmedians():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(7))
-@@ -2686,7 +2688,7 @@ def test_vert_violinplot_showmedians():
+@@ -2796,7 +2797,7 @@ def test_vert_violinplot_showmedians():
+                   showmedians=1)
  
  
- @image_comparison(baseline_images=['violinplot_vert_showall'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
+-@image_comparison(['violinplot_vert_showall.png'])
++@image_comparison(['violinplot_vert_showall.png'], tol=0.2)
  def test_vert_violinplot_showall():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(11))
-@@ -2697,7 +2699,7 @@ def test_vert_violinplot_showall():
+@@ -2807,7 +2808,7 @@ def test_vert_violinplot_showall():
+                   quantiles=[[0.1, 0.9], [0.2, 0.8], [0.3, 0.7], [0.4, 0.6]])
  
  
- @image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
+-@image_comparison(['violinplot_vert_custompoints_10.png'])
++@image_comparison(['violinplot_vert_custompoints_10.png'], tol=0.22)
  def test_vert_violinplot_custompoints_10():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(13))
-@@ -2708,7 +2710,7 @@ def test_vert_violinplot_custompoints_10():
+@@ -2817,7 +2818,7 @@ def test_vert_violinplot_custompoints_10():
+                   showmedians=0, points=10)
  
  
- @image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
+-@image_comparison(['violinplot_vert_custompoints_200.png'])
++@image_comparison(['violinplot_vert_custompoints_200.png'], tol=0.22)
  def test_vert_violinplot_custompoints_200():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(17))
-@@ -2719,7 +2721,7 @@ def test_vert_violinplot_custompoints_200():
+@@ -2827,7 +2828,7 @@ def test_vert_violinplot_custompoints_200():
+                   showmedians=0, points=200)
  
  
- @image_comparison(baseline_images=['violinplot_horiz_baseline'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
+-@image_comparison(['violinplot_horiz_baseline.png'])
++@image_comparison(['violinplot_horiz_baseline.png'], tol=0.2)
  def test_horiz_violinplot_baseline():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(19))
-@@ -2730,7 +2732,7 @@ def test_horiz_violinplot_baseline():
+@@ -2837,7 +2838,7 @@ def test_horiz_violinplot_baseline():
+                   showextrema=0, showmedians=0)
  
  
- @image_comparison(baseline_images=['violinplot_horiz_showmedians'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.23)
+-@image_comparison(['violinplot_horiz_showmedians.png'])
++@image_comparison(['violinplot_horiz_showmedians.png'], tol=0.23)
  def test_horiz_violinplot_showmedians():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(23))
-@@ -2741,7 +2743,7 @@ def test_horiz_violinplot_showmedians():
+@@ -2847,7 +2848,7 @@ def test_horiz_violinplot_showmedians():
+                   showextrema=0, showmedians=1)
  
  
- @image_comparison(baseline_images=['violinplot_horiz_showmeans'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.25)
+-@image_comparison(['violinplot_horiz_showmeans.png'])
++@image_comparison(['violinplot_horiz_showmeans.png'], tol=0.25)
  def test_horiz_violinplot_showmeans():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(29))
-@@ -2752,7 +2754,7 @@ def test_horiz_violinplot_showmeans():
+@@ -2857,7 +2858,7 @@ def test_horiz_violinplot_showmeans():
+                   showextrema=0, showmedians=0)
  
  
- @image_comparison(baseline_images=['violinplot_horiz_showextrema'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.2)
+-@image_comparison(['violinplot_horiz_showextrema.png'])
++@image_comparison(['violinplot_horiz_showextrema.png'], tol=0.2)
  def test_horiz_violinplot_showextrema():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(31))
-@@ -2763,7 +2765,7 @@ def test_horiz_violinplot_showextrema():
+@@ -2867,7 +2868,7 @@ def test_horiz_violinplot_showextrema():
+                   showextrema=1, showmedians=0)
  
  
- @image_comparison(baseline_images=['violinplot_horiz_showall'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.19)
+-@image_comparison(['violinplot_horiz_showall.png'])
++@image_comparison(['violinplot_horiz_showall.png'], tol=0.19)
  def test_horiz_violinplot_showall():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(37))
-@@ -2774,7 +2776,7 @@ def test_horiz_violinplot_showall():
+@@ -2878,7 +2879,7 @@ def test_horiz_violinplot_showall():
+                   quantiles=[[0.1, 0.9], [0.2, 0.8], [0.3, 0.7], [0.4, 0.6]])
  
  
- @image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
+-@image_comparison(['violinplot_horiz_custompoints_10.png'])
++@image_comparison(['violinplot_horiz_custompoints_10.png'], tol=0.22)
  def test_horiz_violinplot_custompoints_10():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(41))
-@@ -2785,7 +2787,7 @@ def test_horiz_violinplot_custompoints_10():
+@@ -2888,7 +2889,7 @@ def test_horiz_violinplot_custompoints_10():
+                   showextrema=0, showmedians=0, points=10)
  
  
- @image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.22)
+-@image_comparison(['violinplot_horiz_custompoints_200.png'])
++@image_comparison(['violinplot_horiz_custompoints_200.png'], tol=0.22)
  def test_horiz_violinplot_custompoints_200():
      ax = plt.axes()
      # First 9 digits of frac(sqrt(43))
-@@ -3509,8 +3511,7 @@ def test_vertex_markers():
+@@ -3647,8 +3648,7 @@ def test_vertex_markers():
+     ax.set_ylim([-1, 10])
  
  
- @image_comparison(baseline_images=['vline_hline_zorder',
--                                   'errorbar_zorder'],
+-@image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
 -                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+                                   'errorbar_zorder'])
++@image_comparison(['vline_hline_zorder', 'errorbar_zorder'])
  def test_eb_line_zorder():
      x = list(range(10))
  
-@@ -4190,7 +4191,7 @@ def test_psd_noise():
+@@ -4335,7 +4335,7 @@ def test_psd_noise():
+     ax3.set_ylabel('')
  
  
- @image_comparison(baseline_images=['csd_freqs'], remove_text=True,
--                  extensions=['png'], tol=0.002)
-+                  extensions=['png'], tol=0.21)
+-@image_comparison(['csd_freqs.png'], remove_text=True, tol=0.002)
++@image_comparison(['csd_freqs.png'], remove_text=True, tol=0.21)
  def test_csd_freqs():
      '''test axes.csd with sinusoidal stimuli'''
      n = 10000
-@@ -5108,7 +5109,7 @@ def test_rc_spines():
+@@ -5239,7 +5239,7 @@ def test_rc_spines():
+         fig, ax = plt.subplots()
  
  
- @image_comparison(baseline_images=['rc_grid'], extensions=['png'],
--                  savefig_kwarg={'dpi': 40})
-+                  savefig_kwarg={'dpi': 40}, tol=0.2)
+-@image_comparison(['rc_grid.png'], savefig_kwarg={'dpi': 40})
++@image_comparison(['rc_grid.png'], savefig_kwarg={'dpi': 40}, tol=0.2)
  def test_rc_grid():
      fig = plt.figure()
      rc_dict0 = {
-@@ -5670,7 +5671,7 @@ def test_date_timezone_y():
+@@ -5781,7 +5781,7 @@ def test_date_timezone_y():
+     plt.plot_date([3] * 3, time_index, tz='UTC', xdate=False, ydate=True)
  
  
- @image_comparison(baseline_images=['date_timezone_x_and_y'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=3.05)
+-@image_comparison(['date_timezone_x_and_y.png'])
++@image_comparison(['date_timezone_x_and_y.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
+index 0983283ec..c4032f920 100644
 --- a/lib/matplotlib/tests/test_collections.py
 +++ b/lib/matplotlib/tests/test_collections.py
-@@ -466,7 +466,7 @@ def test_EllipseCollection():
+@@ -461,7 +461,7 @@ def test_EllipseCollection():
+     ax.autoscale_view()
  
  
- @image_comparison(baseline_images=['polycollection_close'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.45)
+-@image_comparison(['polycollection_close.png'], remove_text=True)
++@image_comparison(['polycollection_close.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
+index 6d1f39149..4d70f8506 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)
+@@ -95,7 +95,7 @@ def _colorbar_extension_length(spacing):
+ 
+ 
+ @image_comparison(['colorbar_extensions_shape_uniform.png',
+-                   'colorbar_extensions_shape_proportional.png'])
++                   'colorbar_extensions_shape_proportional.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():
+@@ -104,7 +104,7 @@ def test_colorbar_extension_shape():
  
- @image_comparison(baseline_images=['colorbar_extensions_uniform',
-                                    'colorbar_extensions_proportional'],
--                  extensions=['png'])
-+                  extensions=['png'], tol=0.25)
+ 
+ @image_comparison(['colorbar_extensions_uniform.png',
+-                   'colorbar_extensions_proportional.png'])
++                   'colorbar_extensions_proportional.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',
-                                    ],
+@@ -118,7 +118,7 @@ def test_colorbar_extension_length():
+                    'cbar_sharing',
+                    ],
                    extensions=['png'], remove_text=True,
 -                  savefig_kwarg={'dpi': 40})
 +                  savefig_kwarg={'dpi': 40}, tol=0.17)
  def test_colorbar_positioning():
      data = np.arange(1200).reshape(30, 40)
      levels = [0, 200, 400, 600, 800, 1000, 1200]
-@@ -175,7 +175,7 @@ def test_colorbar_positioning():
+@@ -171,7 +171,7 @@ def test_colorbar_positioning():
  
- @image_comparison(baseline_images=['cbar_with_subplots_adjust'],
-                   extensions=['png'], remove_text=True,
+ 
+ @image_comparison(['cbar_with_subplots_adjust.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():
+@@ -226,7 +226,7 @@ def test_colorbarbase():
+     ColorbarBase(ax, plt.cm.bone)
  
- @image_comparison(
-     baseline_images=['colorbar_closed_patch'],
--    remove_text=True)
-+    remove_text=True,
-+    tol=0.22)
+ 
+-@image_comparison(['colorbar_closed_patch'], remove_text=True)
++@image_comparison(['colorbar_closed_patch'], 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
+index 75311e70e..64e7bcd25 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -246,7 +246,7 @@ def test_constrained_layout12():
+@@ -234,7 +234,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'])
+-@image_comparison(['constrained_layout13.png'], tol=2.e-2)
++@image_comparison(['constrained_layout13.png'], tol=3e-2)
  def test_constrained_layout13():
      'Test that padding works.'
+     fig, axs = plt.subplots(2, 2, constrained_layout=True)
 diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index d78dcb1ff..ad39426e2 100644
+index 4aabd36a7..14a52920e 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():
+@@ -162,7 +162,7 @@ def test_given_colors_levels_and_extends():
  
  
- @image_comparison(baseline_images=['contour_datetime_axis'],
--                  extensions=['png'], remove_text=False, style='mpl20')
-+                  extensions=['png'], remove_text=False, style='mpl20',
-+                  tol=0.18)
+ @image_comparison(['contour_datetime_axis.png'],
+-                  remove_text=False, style='mpl20')
++                  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():
+@@ -188,7 +188,7 @@ def test_contour_datetime_axis():
  
  
- @image_comparison(baseline_images=['contour_test_label_transforms'],
--                  extensions=['png'], remove_text=True, style='mpl20')
-+                  extensions=['png'], remove_text=True, style='mpl20',
-+                  tol=1.38)
+ @image_comparison(['contour_test_label_transforms.png'],
+-                  remove_text=True, style='mpl20')
++                  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():
+@@ -219,7 +219,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)
+ @image_comparison(['contour_corner_mask_False.png',
+                    'contour_corner_mask_True.png'],
+-                  remove_text=True)
++                  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
+index ee67b4e41..3ae6e4ebc 100644
 --- a/lib/matplotlib/tests/test_cycles.py
 +++ b/lib/matplotlib/tests/test_cycles.py
-@@ -9,7 +9,6 @@ from cycler import cycler
+@@ -8,8 +8,7 @@ import pytest
+ 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'])
+-@image_comparison(['color_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(['color_cycle_basic.png'], remove_text=True)
  def test_colorcycle_basic():
      fig, ax = plt.subplots()
-@@ -27,7 +26,6 @@ def test_colorcycle_basic():
+     ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']))
+@@ -25,8 +24,7 @@ def test_colorcycle_basic():
+     ax.legend(loc='upper left')
  
  
- @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   remove_text=True, extensions=['png'])
+-@image_comparison(['marker_cycle.png', 'marker_cycle.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(['marker_cycle.png', 'marker_cycle.png'], remove_text=True)
  def test_marker_cycle():
      fig, ax = plt.subplots()
-@@ -61,7 +59,6 @@ def test_marker_cycle():
+     ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
+@@ -58,8 +56,7 @@ def test_marker_cycle():
+     ax.legend(loc='upper left')
  
  
- @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'])
+-@image_comparison(['lineprop_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(['lineprop_cycle_basic.png'], remove_text=True)
  def test_linestylecycle_basic():
      fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
 diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 6ecb3edbe..47aff1b74 100644
+index a9e8dfade..98d90eea1 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'],
+-@image_comparison(['figure_align_labels'],
 -                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+@image_comparison(baseline_images=['figure_align_labels'])
++@image_comparison(['figure_align_labels'])
  def test_align_labels():
      # Check the figure.align_labels() command
      fig = plt.figure(tight_layout=True)
 diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 22cd78d46..b4d41f882 100644
+index 93cfbb260..6dcdac4dd 100644
 --- a/lib/matplotlib/tests/test_image.py
 +++ b/lib/matplotlib/tests/test_image.py
-@@ -810,7 +810,7 @@ def test_imshow_endianess():
+@@ -928,7 +928,7 @@ def test_imshow_endianess():
  
  
- @image_comparison(baseline_images=['imshow_masked_interpolation'],
+ @image_comparison(['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
+index 71499da44..42413a5c1 100644
 --- a/lib/matplotlib/tests/test_legend.py
 +++ b/lib/matplotlib/tests/test_legend.py
-@@ -108,7 +108,6 @@ def test_multiple_keys():
+@@ -105,8 +105,7 @@ def test_multiple_keys():
+                            (p2, p1): HandlerTuple(ndivide=None, pad=0)})
  
  
- @image_comparison(baseline_images=['rgba_alpha'],
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'], remove_text=True)
+-@image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(['rgba_alpha.png'], remove_text=True)
  def test_alpha_rgba():
      import matplotlib.pyplot as plt
-@@ -120,7 +119,6 @@ def test_alpha_rgba():
+ 
+@@ -116,8 +115,7 @@ def test_alpha_rgba():
+     leg.legendPatch.set_facecolor([1, 0, 0, 0.5])
  
  
- @image_comparison(baseline_images=['rcparam_alpha'],
--                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0),
-                   extensions=['png'], remove_text=True)
+-@image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(['rcparam_alpha.png'], remove_text=True)
  def test_alpha_rcparam():
      import matplotlib.pyplot as plt
-@@ -148,8 +146,7 @@ def test_fancy():
+ 
+@@ -144,8 +142,7 @@ def test_fancy():
                 ncol=2, shadow=True, title="My legend", numpoints=1)
  
  
--@image_comparison(baseline_images=['framealpha'], remove_text=True,
+-@image_comparison(['framealpha'], remove_text=True,
 -                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
-+@image_comparison(baseline_images=['framealpha'], remove_text=True)
++@image_comparison(['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
+index fdf930184..6bf204f8b 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):
+@@ -172,7 +172,7 @@ def baseline_images(request, fontset, index):
                           ['cm', 'stix', 'stixsans', 'dejavusans',
                            'dejavuserif'])
  @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
@@ -477,7 +482,7 @@ index bbb442638..b5d291c87 100644
  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):
+@@ -186,7 +186,7 @@ def test_mathtext_rendering(baseline_images, fontset, index, test, recwarn):
                           ['cm', 'stix', 'stixsans', 'dejavusans',
                            'dejavuserif'])
  @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
@@ -487,172 +492,174 @@ index bbb442638..b5d291c87 100644
      matplotlib.rcParams['mathtext.fontset'] = fontset
      fig = plt.figure(figsize=(5.25, 0.75))
 diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
-index 31c240a60..979ab3ad0 100644
+index 32ce5db1c..63abc712a 100644
 --- a/lib/matplotlib/tests/test_patches.py
 +++ b/lib/matplotlib/tests/test_patches.py
-@@ -259,9 +259,8 @@ def test_wedge_movement():
+@@ -257,8 +257,7 @@ 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)
+-@image_comparison(['wedge_range'], remove_text=True, tol=1.65 if on_win else 0)
++@image_comparison(['wedge_range'], 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
+index eddd1a3a1..f6993ec31 100644
 --- a/lib/matplotlib/tests/test_patheffects.py
 +++ b/lib/matplotlib/tests/test_patheffects.py
-@@ -119,7 +119,7 @@ def test_SimplePatchShadow_offset():
+@@ -115,7 +115,7 @@ def test_SimplePatchShadow_offset():
      assert pe._offset == (4, 5)
  
  
--@image_comparison(baseline_images=['collection'], tol=0.02, style='mpl20')
-+@image_comparison(baseline_images=['collection'], tol=0.084, style='mpl20')
+-@image_comparison(['collection'], tol=0.02, style='mpl20')
++@image_comparison(['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
+index 0fad3cdf2..aab0b29c6 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')
+ 
+ @image_comparison(['multi_pickle.png'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.082}.get(platform.machine(), 0.0))
++                  tol=0.11)
  def test_complete():
      fig = plt.figure('Figure with a label?', figsize=(10, 6))
+ 
 diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
-index eab049d91..c3708890b 100644
+index 68031bff2..68d84d60e 100644
 --- a/lib/matplotlib/tests/test_quiver.py
 +++ b/lib/matplotlib/tests/test_quiver.py
-@@ -155,7 +155,7 @@ def test_quiver_key_xy():
+@@ -173,7 +173,7 @@ def test_quiver_key_xy():
+             ax.quiverkey(q, X=x, Y=0.8, U=1, angle=angle, label='', color='b')
  
  
- @image_comparison(baseline_images=['barbs_test_image'],
--                  extensions=['png'], remove_text=True)
-+                  extensions=['png'], remove_text=True, tol=0.11)
+-@image_comparison(['barbs_test_image.png'], remove_text=True)
++@image_comparison(['barbs_test_image.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
+index 1afc60543..aa12ab5ea 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'],
+ @image_comparison(['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
+index f35467ee7..b3ca0c020 100644
 --- a/lib/matplotlib/tests/test_transforms.py
 +++ b/lib/matplotlib/tests/test_transforms.py
-@@ -70,7 +70,7 @@ def test_external_transform_api():
+@@ -68,7 +68,7 @@ def test_external_transform_api():
  
  
- @image_comparison(baseline_images=['pre_transform_data'],
+ @image_comparison(['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
+index f14425144..c1afffcaa 100644
 --- a/lib/matplotlib/tests/test_units.py
 +++ b/lib/matplotlib/tests/test_units.py
-@@ -73,7 +73,6 @@ def quantity_converter():
+@@ -73,8 +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),
-                   extensions=['png'], remove_text=False, style='mpl20')
+-@image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++@image_comparison(['plot_pint.png'], remove_text=False, style='mpl20')
  def test_numpy_facade(quantity_converter):
-     # Register the class
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
 diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
-index 7105a6480..a5fecba1b 100644
+index e69b63f99..0c2dd5660 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():
+@@ -18,7 +18,7 @@ def test_subplot():
+     fig.add_subplot(ax)
  
  
- @image_comparison(baseline_images=['curvelinear3'],
--                  extensions=['png'], style='default', tol=0.01)
-+                  extensions=['png'], style='default', tol=0.02)
+-@image_comparison(['curvelinear3.png'], style='default', tol=0.01)
++@image_comparison(['curvelinear3.png'], style='default', tol=0.02)
  def test_curvelinear3():
      fig = plt.figure(figsize=(5, 5))
  
-@@ -74,7 +74,7 @@ def test_curvelinear3():
+@@ -72,7 +72,7 @@ def test_curvelinear3():
+     l.set_clip_path(ax1.patch)
  
  
- @image_comparison(baseline_images=['curvelinear4'],
--                  extensions=['png'], style='default', tol=0.015)
-+                  extensions=['png'], style='default', tol=0.055)
+-@image_comparison(['curvelinear4.png'], style='default', tol=0.015)
++@image_comparison(['curvelinear4.png'], style='default', tol=0.055)
  def test_curvelinear4():
-     fig = plt.figure(figsize=(5, 5))
- 
+     # Remove this line when this test image is regenerated.
+     plt.rcParams['text.kerning_factor'] = 6
 diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-index 32e1c884d..2b38866c5 100644
+index 611908063..8add49b46 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 \
+@@ -16,8 +16,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
+     GridHelperCurveLinear
  
  
- @image_comparison(baseline_images=['custom_transform'],
--                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.035)
+-@image_comparison(['custom_transform.png'], style='default',
+-                  tol={'aarch64': 0.034}.get(platform.machine(), 0.03))
++@image_comparison(['custom_transform.png'], style='default', tol=0.035)
  def test_custom_transform():
      class MyTransform(Transform):
          input_dims = 2
-@@ -85,7 +85,7 @@ def test_custom_transform():
+@@ -84,7 +83,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')
+ @image_comparison(['polar_box.png'], style='default',
+-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03))
++                  tol=0.08)
  def test_polar_box():
-     fig = plt.figure(figsize=(5, 5))
-@@ -147,7 +147,7 @@ def test_polar_box():
+     # Remove this line when this test image is regenerated.
+     plt.rcParams['text.kerning_factor'] = 6
+@@ -147,7 +146,7 @@ def test_polar_box():
+     ax1.grid(True)
  
  
- @image_comparison(baseline_images=['axis_direction'],
--                  extensions=['png'], style='default', tol=0.03)
-+                  extensions=['png'], style='default', tol=0.05)
+-@image_comparison(['axis_direction.png'], style='default', tol=0.03)
++@image_comparison(['axis_direction.png'], style='default', tol=0.05)
  def test_axis_direction():
-     fig = plt.figure(figsize=(5, 5))
- 
+     # Remove this line when this test image is regenerated.
+     plt.rcParams['text.kerning_factor'] = 6
 diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
-index 4bfb6f8ff..a6eee9ff6 100644
+index 592096b74..69ac5a2b3 100644
 --- a/lib/mpl_toolkits/tests/test_mplot3d.py
 +++ b/lib/mpl_toolkits/tests/test_mplot3d.py
-@@ -269,7 +269,7 @@ def test_text3d():
+@@ -280,7 +280,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)
+-@image_comparison(['trisurf3d.png'], remove_text=True, tol=0.03)
++@image_comparison(['trisurf3d.png'], 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
-     )
+@@ -756,7 +756,7 @@ class TestVoxels:
+             assert voxels[coord], "faces returned for absent voxel"
+             assert isinstance(poly, art3d.Poly3DCollection)
+ 
+-    @image_comparison(['voxels-xyz.png'], tol=0.01)
++    @image_comparison(['voxels-xyz.png'], tol=0.02)
      def test_xyz(self):
          fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
+ 
 -- 
-2.21.0
+2.21.1
 
diff --git a/0004-Increase-some-tolerances-for-non-x86-arches.patch b/0004-Increase-some-tolerances-for-non-x86-arches.patch
index 6a6f560..0921a85 100644
--- a/0004-Increase-some-tolerances-for-non-x86-arches.patch
+++ b/0004-Increase-some-tolerances-for-non-x86-arches.patch
@@ -1,4 +1,4 @@
-From 559f45bb0334b2c920f288a2a010b11c0dba9a49 Mon Sep 17 00:00:00 2001
+From a37200542ac349b98dc64f4e697396b80f42f0d9 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.
@@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  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_constrainedlayout.py              | 3 ++-
  lib/matplotlib/tests/test_cycles.py                         | 6 +++---
  lib/matplotlib/tests/test_figure.py                         | 2 +-
  lib/matplotlib/tests/test_image.py                          | 2 +-
@@ -18,47 +18,47 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  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(-)
+ 13 files changed, 22 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
+index a9409e2c1..9627b3569 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():
+@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
  
- @image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'],
-                   remove_text=True, extensions=['png'],
+ 
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
 -                  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():
+@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
  
- @image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'],
-                   remove_text=True, extensions=['png'],
+ 
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
 -                  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 1168ef983..ab553e29e 100644
+index ba9c2005b..5da72b9ed 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
-@@ -395,7 +395,7 @@ def test_annotate_default_arrow():
+@@ -407,7 +407,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)
+-@image_comparison(['polar_axes'], style='default')
++@image_comparison(['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
-@@ -3502,7 +3502,7 @@ def test_vertex_markers():
+@@ -3648,7 +3648,7 @@ def test_vertex_markers():
  
- @image_comparison(baseline_images=['vline_hline_zorder',
-                                    'errorbar_zorder'],
+ 
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
 -                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
 +                  tol=0.02)
  def test_eb_line_zorder():
@@ -78,189 +78,190 @@ index ad23abe3f..7b9660f2b 100644
  
  @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 c12ed7004..bc741678f 100644
+index 0983283ec..1b079aff1 100644
 --- a/lib/matplotlib/tests/test_collections.py
 +++ b/lib/matplotlib/tests/test_collections.py
-@@ -442,7 +442,7 @@ def test_barb_limits():
+@@ -439,7 +439,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)
+ 
+ @image_comparison(['EllipseCollection_test_image.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.012)
  def test_EllipseCollection():
      # Test basic functionality
+     fig, ax = plt.subplots()
 diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index df3e5cf18..2d0d0f02a 100644
+index 75311e70e..8de7b987d 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -173,7 +173,7 @@ def test_constrained_layout9():
+@@ -164,7 +164,8 @@ def test_constrained_layout9():
+     fig.suptitle('Test Suptitle', fontsize=28)
  
  
- @image_comparison(baseline_images=['constrained_layout10'],
--        extensions=['png'])
-+        extensions=['png'], tol=0.01)
+-@image_comparison(['constrained_layout10.png'])
++@image_comparison(['constrained_layout10.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
+index ee67b4e41..c52a5b0f8 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'])
+ @image_comparison(['color_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.008)
  def test_colorcycle_basic():
      fig, ax = plt.subplots()
-@@ -27,7 +27,7 @@ def test_colorcycle_basic():
+     ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']))
+@@ -26,7 +26,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'])
+ @image_comparison(['marker_cycle.png', 'marker_cycle.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.008)
  def test_marker_cycle():
      fig, ax = plt.subplots()
-@@ -61,7 +61,7 @@ def test_marker_cycle():
+     ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
+@@ -59,7 +59,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'])
+ @image_comparison(['lineprop_cycle_basic.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.009)
  def test_linestylecycle_basic():
      fig, ax = plt.subplots()
+     ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
 diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 6ecb3edbe..207659648 100644
+index a9e8dfade..322acd41e 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'],
+ @image_comparison(['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 ae803000d..0091fc03f 100644
+index 93cfbb260..122c884da 100644
 --- a/lib/matplotlib/tests/test_image.py
 +++ b/lib/matplotlib/tests/test_image.py
-@@ -810,7 +810,7 @@ def test_imshow_endianess():
+@@ -928,7 +928,7 @@ def test_imshow_endianess():
  
  
- @image_comparison(baseline_images=['imshow_masked_interpolation'],
+ @image_comparison(['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
+index 71499da44..23cfcb873 100644
 --- a/lib/matplotlib/tests/test_legend.py
 +++ b/lib/matplotlib/tests/test_legend.py
-@@ -108,7 +108,7 @@ def test_multiple_keys():
+@@ -106,7 +106,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)
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.007)
  def test_alpha_rgba():
      import matplotlib.pyplot as plt
-@@ -120,7 +120,7 @@ def test_alpha_rgba():
+ 
+@@ -117,7 +117,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)
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.007)
  def test_alpha_rcparam():
      import matplotlib.pyplot as plt
-@@ -149,7 +149,7 @@ def test_fancy():
+ 
+@@ -145,7 +145,7 @@ def test_fancy():
  
  
- @image_comparison(baseline_images=['framealpha'], remove_text=True,
+ @image_comparison(['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
+index 0fad3cdf2..4d2599607 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')
+ 
+ @image_comparison(['multi_pickle.png'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.082}.get(platform.machine(), 0.0))
++                  tol=0.082)
  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
+index 1afc60543..dcac38102 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')
+ @image_comparison(['streamplot_linewidth'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.002)
  def test_linewidth():
      X, Y, U, V = velocity_field()
+     speed = np.hypot(U, V)
 diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index 7d0f38a70..ef21a166c 100644
+index f14425144..fd8f26502 100644
 --- a/lib/matplotlib/tests/test_units.py
 +++ b/lib/matplotlib/tests/test_units.py
-@@ -73,7 +73,7 @@ def quantity_converter():
+@@ -74,7 +74,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')
+ @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.003)
  def test_numpy_facade(quantity_converter):
-     # Register the class
-@@ -98,7 +98,7 @@ def test_numpy_facade(quantity_converter):
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -101,7 +101,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')
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+-                  tol={'aarch64': 0.02}.get(platform.machine(), 0.0))
++                  tol=0.007)
  def test_plot_masked_units():
      data = np.linspace(-5, 5)
+     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
 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
+index 611908063..be11d7c6b 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)
+ @image_comparison(['custom_transform.png'], style='default',
+-                  tol={'aarch64': 0.034}.get(platform.machine(), 0.03))
++                  tol=0.04)
  def test_custom_transform():
      class MyTransform(Transform):
          input_dims = 2
-@@ -85,7 +85,7 @@ def test_custom_transform():
+@@ -84,7 +84,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')
+ @image_comparison(['polar_box.png'], style='default',
+-                  tol={'aarch64': 0.04}.get(platform.machine(), 0.03))
++                  tol=0.04)
  def test_polar_box():
-     fig = plt.figure(figsize=(5, 5))
+     # Remove this line when this test image is regenerated.
+     plt.rcParams['text.kerning_factor'] = 6
 -- 
-2.21.0
+2.21.1
 
diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index 2d606a0..551c10b 100644
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -37,14 +37,14 @@
 #global rctag rc2
 
 # Updated test images for new FreeType.
-%global mpl_images_version 3.1.1
+%global mpl_images_version 3.2.0
 
 # The version of FreeType in this Fedora branch.
-%global ftver 2.10.0
+%global ftver 2.10.1
 
 Name:           python-matplotlib
-Version:        3.1.2
-Release:        1%{?rctag:.%{rctag}}%{?dist}.1
+Version:        3.2.0
+Release:        1%{?rctag:.%{rctag}}%{?dist}
 Summary:        Python 2D plotting library
 # qt4_editor backend is MIT
 License:        Python and MIT
@@ -59,15 +59,6 @@ Patch0001:      0001-Force-using-system-qhull.patch
 # Don't attempt to download jQuery and jQuery UI
 Patch0002:      0001-Use-packaged-jquery-and-jquery-ui.patch
 
-# Fix WebAgg test
-# https://github.com/matplotlib/matplotlib/pull/15737
-Patch0003:      0001-Fix-env-override-in-WebAgg-backend-test.patch
-# https://github.com/matplotlib/matplotlib/pull/15763
-Patch0004:      0001-Skip-webagg-test-if-tornado-is-not-available.patch
-# https://github.com/matplotlib/matplotlib/pull/16086
-Patch0005:      0001-Use-supported-attribute-to-check-pillow-version.patch
-
-
 # Fedora-specific patches; see:
 # https://github.com/fedora-python/matplotlib/tree/fedora-patches
 # https://github.com/fedora-python/matplotlib/tree/fedora-patches-non-x86
@@ -76,7 +67,7 @@ Source1000:     https://github.com/QuLogic/mpl-images/archive/v%{mpl_images_vers
 # 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
+Patch1002:      0002-Set-FreeType-version-to-%{ftver}-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
@@ -95,11 +86,11 @@ BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  zlib-devel
 
 %description
-Matplotlib is a python 2D plotting library which produces publication
+Matplotlib is a Python 2D plotting library which produces publication
 quality figures in a variety of hardcopy formats and interactive
-environments across platforms. matplotlib can be used in python
-scripts, the python and ipython shell, web application servers, and
-six graphical user interface toolkits.
+environments across platforms. Matplotlib can be used in Python
+scripts, the Python and IPython shell, web application servers, and
+various graphical user interface toolkits.
 
 Matplotlib tries to make easy things easy and hard things possible.
 You can generate plots, histograms, power spectra, bar charts,
@@ -171,11 +162,11 @@ Provides:       bundled(stix-math-fonts)
 %{?python_provide:%python_provide python3-matplotlib}
 
 %description -n python3-matplotlib
-Matplotlib is a python 2D plotting library which produces publication
+Matplotlib is a Python 2D plotting library which produces publication
 quality figures in a variety of hardcopy formats and interactive
-environments across platforms. matplotlib can be used in python
-scripts, the python and ipython shell, web application servers, and
-six graphical user interface toolkits.
+environments across platforms. Matplotlib can be used in Python
+scripts, the Python and IPython shell, web application servers, and
+various graphical user interface toolkits.
 
 Matplotlib tries to make easy things easy and hard things possible.
 You can generate plots, histograms, power spectra, bar charts,
@@ -269,12 +260,6 @@ Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 
 %patch0002 -p1
 
-%patch0003 -p1
-
-%patch0004 -p1
-
-%patch0005 -p1
-
 # Fedora-specific patches follow:
 %patch1001 -p1
 # Updated test images for new FreeType.
@@ -294,19 +279,6 @@ rm -r extern/libqhull
 # Copy setup.cfg to the builddir
 cp -p %{SOURCE1} setup.cfg
 
-# Keep this until next version, and increment if changing from
-# USE_FONTCONFIG to False or True so that cache is regenerated
-# if updated from a version enabling fontconfig to one not
-# enabling it, or vice versa
-if [ %{version} = 1.4.3 ]; then
-    sed -i 's/\(__version__ = 200\)/\1.1/' lib/matplotlib/font_manager.py
-fi
-
-%if !%{with_bundled_fonts}
-# Use fontconfig by default
-sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py
-%endif
-
 
 %build
 %set_build_flags
@@ -350,7 +322,6 @@ 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 \
@@ -448,20 +419,19 @@ PYTHONDONTWRITEBYTECODE=1 \
 %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/__pycache__/tkagg.*
 %{python3_sitearch}/matplotlib/backends/_tkagg.*
 
 %files -n python3-matplotlib-wx
 %{python3_sitearch}/matplotlib/backends/backend_wx*.py
-%{python3_sitearch}/matplotlib/backends/wx_compat.py
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_wx*
-%{python3_sitearch}/matplotlib/backends/__pycache__/wx_compat.*
 
 
 %changelog
+* Tue Mar 03 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.2.0-1
+- Update to latest version
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 137dd57..d61d95a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (matplotlib-3.1.2.tar.gz) = 514e66ff76381dccb185a8b8dee44ecbf5108e99ecc5ce46b56750e2a62b782e2b67f0ba02b01545541a1499ffe2347b6bc502077455d8a742796161017cba42
-SHA512 (matplotlib-3.1.1-with-freetype-2.10.0.tar.gz) = 257546b047ff79302b616f1d37caa028a7b9abc1682cf10861e1347a3db9f437967abe24e11aee898ae11c6f163939d48bc5aeaec2894d6472b4326f8edaed8b
+SHA512 (matplotlib-3.2.0.tar.gz) = bbc800b3f6c2d4d1161f7b6cc6c72c637abe9d70adfc17bb02d6e21022c957e485d6da02209163460c9bb96eaf544e09c8eba9f80ac30ec95348b6dff3d32ebb
+SHA512 (matplotlib-3.2.0-with-freetype-2.10.1.tar.gz) = 5fefa148dae612b431bbf1430f93df20f3cfc06f01db072148893bf067f1fab5c9944575a3d1a587fe7d44b17fb755f4532bf61dfdb7fc64b2fd7821f9fa12ac