Add missing requires of dvipng to python3-matplotlib (#1270202 )

Remove spurious Provides: bundled(agg)
2016-04-18 09:27:28 +02:00 · 2016-04-04 13:28:22 +02:00
18 changed files with 413 additions and 1560 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,24 +6,3 @@ matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-1.3.1-without-gpc.tar.xz
 /matplotlib-1.4.3-without-gpc.tar.xz
 /matplotlib-1.4.3-without-extern.tar.xz
 /matplotlib-1.5.1-without-extern.tar.xz
 /matplotlib-1.5.1.tar.gz
 /matplotlib-1.5.2rc2.tar.gz
 /matplotlib-2.0.0b4.tar.gz
 /matplotlib-2.0.0rc2.tar.gz
 /matplotlib-2.0.0.tar.gz
 /matplotlib-2.0.0-without-copyrighted.tar.xz
 /matplotlib-2.0.1.tar.gz
 /matplotlib-2.0.2.tar.gz
 /matplotlib-2.1.0rc1.tar.gz
 /matplotlib-2.1.0.tar.gz
 /matplotlib-2.1.1.tar.gz
 /matplotlib-2.1.2.tar.gz
 /matplotlib-2.1.2-with-freetype-2.8.tar.gz
 /matplotlib-2.2.2.tar.gz
 /matplotlib-2.2.2-with-freetype-2.8.tar.gz
 /matplotlib-2.2.2-with-freetype-2.9.tar.gz
 /matplotlib-2.2.3.tar.gz
 /matplotlib-2.2.3-with-freetype-2.8.tar.gz
 /matplotlib-2.2.3-with-freetype-2.9.1.tar.gz
 /matplotlib-2.2.4.tar.gz
--- a/0001-Force-using-system-qhull.patch
+++ b/0001-Force-using-system-qhull.patch
@@ -1,43 +0,0 @@
 From 46361ca058295e3f08d3c54196d990c497834306 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Fri, 30 Mar 2018 03:15:51 -0400
 Subject: [PATCH] Force using system qhull.
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 setupext.py | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)
 diff --git a/setupext.py b/setupext.py
 index d2ff239ad..30e0c9085 100644
 --- a/setupext.py
 +++ b/setupext.py
@@ -1318,23 +1318,10 @@ class Qhull(SetupPackage):
     def check(self):
         self.__class__.found_external = True
 -        try:
 -            return self._check_for_pkg_config(
 -                'libqhull', 'libqhull/qhull_a.h', min_version='2015.2')
 -        except CheckFailed as e:
 -            self.__class__.found_pkgconfig = False
 -            self.__class__.found_external = False
 -            return str(e) + ' Using local copy.'
 +        return ' Using system copy.'
     def add_flags(self, ext):
 -        if self.found_external:
 -            pkg_config.setup_extension(ext, 'qhull',
 -                                       default_libraries=['qhull'])
 -        else:
 -            ext.include_dirs.insert(0, 'extern')
 -            ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
 -            if sysconfig.get_config_var('LIBM') == '-lm':
 -                ext.libraries.extend('m')
 +        ext.libraries.append('qhull')
 class TTConv(SetupPackage):
 -- 
 2.14.3
--- a/0001-Use-packaged-jquery-and-jquery-ui.patch
+++ b/0001-Use-packaged-jquery-and-jquery-ui.patch
@@ -1,116 +0,0 @@
 From d873c282f4ab93f14c6b4ac6f4210852024dba78 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Sat, 2 Mar 2019 18:18:29 -0500
 Subject: [PATCH] Use packaged jquery and jquery-ui.
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 .../backends/web_backend/all_figures.html     |  6 +--
 .../backends/web_backend/single_figure.html   |  6 +--
 setup.py                                      | 49 -------------------
 3 files changed, 6 insertions(+), 55 deletions(-)
 diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html
 index 41f48dc6d..69097eb4f 100644
 --- a/lib/matplotlib/backends/web_backend/all_figures.html
 +++ b/lib/matplotlib/backends/web_backend/all_figures.html
@@ -3,9 +3,9 @@
     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
 -    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
 +    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
 +    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
 +    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
     <script src="{{ prefix }}/js/mpl.js"></script>
 diff --git a/lib/matplotlib/backends/web_backend/single_figure.html b/lib/matplotlib/backends/web_backend/single_figure.html
 index 4d5a366fb..c11c86618 100644
 --- a/lib/matplotlib/backends/web_backend/single_figure.html
 +++ b/lib/matplotlib/backends/web_backend/single_figure.html
@@ -3,9 +3,9 @@
     <link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
     <link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
     <link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
 -    <link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
 -    <script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
 +    <link rel="stylesheet" href="/usr/share/javascript/jquery_ui/jquery-ui.min.css" >
 +    <script src="/usr/share/javascript/jquery/latest/jquery.min.js"></script>
 +    <script src="/usr/share/javascript/jquery_ui/jquery-ui.min.js"></script>
     <script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
     <script src="{{ prefix }}/js/mpl.js"></script>
     <script>
 diff --git a/setup.py b/setup.py
 index 41037e95d..7a0af717f 100644
 --- a/setup.py
 +++ b/setup.py
@@ -35,8 +35,6 @@ from zipfile import ZipFile
 from setuptools import setup
 from setuptools.command.build_ext import build_ext as BuildExtCommand
 -from setuptools.command.develop import develop as DevelopCommand
 -from setuptools.command.install_lib import install_lib as InstallLibCommand
 from setuptools.command.test import test as TestCommand
 # The setuptools version of sdist adds a setup.cfg file to the tree.
@@ -146,53 +144,6 @@ cmdclass['test'] = NoopTestCommand
 cmdclass['build_ext'] = BuildExtraLibraries
 -def _download_jquery_to(dest):
 -    # Note: When bumping the jquery-ui version, also update the versions in
 -    # single_figure.html and all_figures.html.
 -    url = "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
 -    sha = 'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
 -    if not os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
 -        _makedirs(dest, exist_ok=True)
 -        try:
 -            buff = download_or_cache(url, sha)
 -        except Exception:
 -            raise IOError("Failed to download jquery-ui.  Please download " +
 -                          "{url} and extract it to {dest}.".format(
 -                              url=url, dest=dest))
 -        with ZipFile(buff) as zf:
 -            zf.extractall(dest)
 -
 -
 -# Relying on versioneer's implementation detail.
 -_orgin_sdist = cmdclass['sdist']
 -
 -
 -class sdist_with_jquery(_orgin_sdist):
 -    def make_release_tree(self, base_dir, files):
 -        _orgin_sdist.make_release_tree(self, base_dir, files)
 -        _download_jquery_to(
 -            os.path.join(base_dir, "lib/matplotlib/backends/web_backend/"))
 -
 -
 -# Affects install and bdist_wheel.
 -class install_lib_with_jquery(InstallLibCommand):
 -    def run(self):
 -        InstallLibCommand.run(self)
 -        _download_jquery_to(
 -            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
 -
 -
 -class develop_with_jquery(DevelopCommand):
 -    def run(self):
 -        DevelopCommand.run(self)
 -        _download_jquery_to("lib/matplotlib/backends/web_backend/")
 -
 -
 -cmdclass['sdist'] = sdist_with_jquery
 -cmdclass['install_lib'] = install_lib_with_jquery
 -cmdclass['develop'] = develop_with_jquery
 -
 -
 # One doesn't normally see `if __name__ == '__main__'` blocks in a setup.py,
 # however, this is needed on Windows to avoid creating infinite subprocesses
 # when using multiprocessing.
 -- 
 2.20.1
--- a/0001-matplotlibrc-path-search-fix.patch
+++ b/0001-matplotlibrc-path-search-fix.patch
@@ -1,97 +0,0 @@
 From 84ebbed32cf1c0f4d56a6191ce7470fda6ea0543 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Wed, 27 Sep 2017 19:35:59 -0400
 Subject: [PATCH 1/3] matplotlibrc path search fix
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 lib/matplotlib/__init__.py            |  8 +++++---
 lib/matplotlib/tests/test_rcparams.py | 22 ++++++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)
 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
 index c5accc3c3..bc38f316c 100644
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
@@ -738,9 +738,12 @@ def _get_data_path():
     _file = _decode_filesystem_path(__file__)
     path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
 +    path = '/usr/share/matplotlib/mpl-data'
     if os.path.isdir(path):
         return path
 +    raise RuntimeError('Could not find the matplotlib data files')
 +
     # setuptools' namespace_packages may highjack this init file
     # so need to try something known to be in matplotlib, not basemap
     import matplotlib.afm
@@ -821,8 +824,7 @@ def matplotlib_fname():
          - `$HOME/.matplotlib/matplotlibrc` if `$HOME` is defined.
 -    - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
 -      system-defined copy.
 +    - Lastly, it looks in `/etc/matplotlibrc` for a system-defined copy.
     """
     def gen_candidates():
@@ -835,7 +837,7 @@ def matplotlib_fname():
             yield matplotlibrc
             yield os.path.join(matplotlibrc, 'matplotlibrc')
         yield os.path.join(_get_configdir(), 'matplotlibrc')
 -        yield os.path.join(get_data_path(), 'matplotlibrc')
 +        yield '/etc/matplotlibrc'
     for fname in gen_candidates():
         if os.path.exists(fname):
 diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
 index c0378e1bf..7f14bcc46 100644
 --- a/lib/matplotlib/tests/test_rcparams.py
 +++ b/lib/matplotlib/tests/test_rcparams.py
@@ -424,14 +424,25 @@ def test_rcparams_reset_after_fail():
         assert mpl.rcParams['text.usetex'] is False
 -def test_if_rctemplate_is_up_to_date():
 +@pytest.fixture
 +def mplrc():
 +    # This is the Fedora-specific location ...
 +    if 'MATPLOTLIBDATA' in os.environ:
 +        # ... in buildroot.
 +        return os.path.join(os.environ['MATPLOTLIBDATA'],
 +                            '../../../../etc/matplotlibrc')
 +    else:
 +        # ... on installed systems.
 +        return '/etc/matplotlibrc'
 +
 +
 +def test_if_rctemplate_is_up_to_date(mplrc):
     # This tests if the matplotlibrc.template file
     # contains all valid rcParams.
     dep1 = mpl._all_deprecated
     dep2 = mpl._deprecated_set
     deprecated = list(dep1.union(dep2))
 -    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
 -    with open(path_to_rc, "r") as f:
 +    with open(mplrc, "r") as f:
         rclines = f.readlines()
     missing = {}
     for k, v in mpl.defaultParams.items():
@@ -453,11 +464,10 @@ def test_if_rctemplate_is_up_to_date():
                          .format(missing.items()))
 -def test_if_rctemplate_would_be_valid(tmpdir):
 +def test_if_rctemplate_would_be_valid(tmpdir, mplrc):
     # This tests if the matplotlibrc.template file would result in a valid
     # rc file if all lines are uncommented.
 -    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
 -    with open(path_to_rc, "r") as f:
 +    with open(mplrc, "r") as f:
         rclines = f.readlines()
     newlines = []
     for line in rclines:
 -- 
 2.20.1
--- a/0002-Increase-tolerances-for-non-x86_64-arches.patch
+++ b/0002-Increase-tolerances-for-non-x86_64-arches.patch
@@ -1,27 +0,0 @@
 From 95035beb712088f9b66aae9cc810a1a94685d0da Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Tue, 23 Jan 2018 20:27:17 -0500
 Subject: [PATCH 2/3] Increase tolerances for non-x86_64 arches.
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 lib/matplotlib/tests/test_streamplot.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
 index 81a51e711..4f70ce861 100644
 --- a/lib/matplotlib/tests/test_streamplot.py
 +++ b/lib/matplotlib/tests/test_streamplot.py
@@ -58,8 +58,7 @@ def test_linewidth():
                    linewidth=lw)
 -@image_comparison(baseline_images=['streamplot_masks_and_nans'],
 -                  tol=0.04 if on_win else 0)
 +@image_comparison(baseline_images=['streamplot_masks_and_nans'], tol=0.01)
 def test_masks_and_nans():
     X, Y, U, V = velocity_field()
     mask = np.zeros(U.shape, dtype=bool)
 -- 
 2.20.1
--- a/0003-Increase-some-tolerances-for-32-bit-systems.patch
+++ b/0003-Increase-some-tolerances-for-32-bit-systems.patch
@@ -1,567 +0,0 @@
 From bcb05f18d78d2a467ddc9cdb0e6bcebd41116ee5 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Sat, 31 Mar 2018 00:15:14 -0400
 Subject: [PATCH 3/3] Increase some tolerances for 32-bit systems.
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 lib/matplotlib/testing/decorators.py          |  2 +-
 lib/matplotlib/tests/test_artist.py           |  3 +-
 lib/matplotlib/tests/test_axes.py             | 47 +++++++++----------
 lib/matplotlib/tests/test_collections.py      |  2 +-
 lib/matplotlib/tests/test_colorbar.py         | 11 +++--
 .../tests/test_constrainedlayout.py           |  2 +-
 lib/matplotlib/tests/test_contour.py          |  6 +--
 lib/matplotlib/tests/test_image.py            |  2 +-
 lib/matplotlib/tests/test_mathtext.py         |  4 +-
 lib/matplotlib/tests/test_patches.py          |  3 +-
 lib/matplotlib/tests/test_patheffects.py      |  2 +-
 lib/matplotlib/tests/test_pickle.py           |  2 +-
 lib/matplotlib/tests/test_quiver.py           |  2 +-
 lib/matplotlib/tests/test_streamplot.py       |  3 +-
 lib/matplotlib/tests/test_transforms.py       |  2 +-
 .../tests/test_axisartist_floating_axes.py    |  4 +-
 ...test_axisartist_grid_helper_curvelinear.py |  6 +--
 lib/mpl_toolkits/tests/test_mplot3d.py        |  4 +-
 18 files changed, 53 insertions(+), 54 deletions(-)
 diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
 index d008446dc..2d930cacc 100644
 --- a/lib/matplotlib/testing/decorators.py
 +++ b/lib/matplotlib/testing/decorators.py
@@ -418,7 +418,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol,
     return decorator
 -def image_comparison(baseline_images, extensions=None, tol=0,
 +def image_comparison(baseline_images, extensions=None, tol=0.1,
                      freetype_version=None, remove_text=False,
                      savefig_kwarg=None,
                      # Default of mpl_test_settings fixture and cleanup too.
 diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
 index e6aff72bf..b60305bcf 100644
 --- a/lib/matplotlib/tests/test_artist.py
 +++ b/lib/matplotlib/tests/test_artist.py
@@ -96,7 +96,8 @@ def test_collection_transform_of_none():
     assert isinstance(c._transOffset, mtransforms.IdentityTransform)
 -@image_comparison(baseline_images=["clip_path_clipping"], remove_text=True)
 +@image_comparison(baseline_images=["clip_path_clipping"], remove_text=True,
 +                  tol=0.28)
 def test_clipping():
     exterior = mpath.Path.unit_rectangle().deepcopy()
     exterior.vertices *= 4
 diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
 index dde856669..5cfd4151a 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
@@ -555,7 +555,7 @@ def test_single_point():
     plt.plot('b', 'b', 'o', data=data)
 -@image_comparison(baseline_images=['single_date'])
 +@image_comparison(baseline_images=['single_date'], tol=1.97)
 def test_single_date():
     time1 = [721964.0]
     data1 = [-65.54]
@@ -739,8 +739,7 @@ def test_polar_rlabel_position():
     ax.tick_params(rotation='auto')
 -@image_comparison(baseline_images=['polar_theta_wedge'], style='default',
 -                  tol=0.01 if six.PY2 else 0)
 +@image_comparison(baseline_images=['polar_theta_wedge'], style='default')
 def test_polar_theta_limits():
     r = np.arange(0, 3.0, 0.01)
     theta = 2*np.pi*r
@@ -1023,7 +1022,7 @@ def test_fill_between_interpolate():
 @image_comparison(baseline_images=['fill_between_interpolate_decreasing'],
 -                  style='mpl20', remove_text=True)
 +                  style='mpl20', remove_text=True, tol=0.78)
 def test_fill_between_interpolate_decreasing():
     p = np.array([724.3, 700, 655])
     t = np.array([9.4, 7, 2.2])
@@ -1105,7 +1104,7 @@ def test_pcolormesh():
 @image_comparison(baseline_images=['pcolormesh_datetime_axis'],
 -                  extensions=['png'], remove_text=False)
 +                  extensions=['png'], remove_text=False, tol=0.19)
 def test_pcolormesh_datetime_axis():
     fig = plt.figure()
     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
@@ -1131,7 +1130,7 @@ def test_pcolormesh_datetime_axis():
 @image_comparison(baseline_images=['pcolor_datetime_axis'],
 -                  extensions=['png'], remove_text=False)
 +                  extensions=['png'], remove_text=False, tol=0.19)
 def test_pcolor_datetime_axis():
     fig = plt.figure()
     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
@@ -1188,7 +1187,7 @@ def test_canonical():
 @image_comparison(baseline_images=['arc_angles'], remove_text=True,
 -                  style='default', extensions=['png'])
 +                  style='default', extensions=['png'], tol=0.17)
 def test_arc_angles():
     from matplotlib import patches
     # Ellipse parameters
@@ -2450,7 +2449,7 @@ def test_boxplot_mod_artist_after_plotting():
 @image_comparison(baseline_images=['violinplot_vert_baseline',
                                    'violinplot_vert_baseline'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.24)
 def test_vert_violinplot_baseline():
     # First 9 digits of frac(sqrt(2))
     np.random.seed(414213562)
@@ -2468,7 +2467,7 @@ def test_vert_violinplot_baseline():
 @image_comparison(baseline_images=['violinplot_vert_showmeans'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.23)
 def test_vert_violinplot_showmeans():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(3))
@@ -2479,7 +2478,7 @@ def test_vert_violinplot_showmeans():
 @image_comparison(baseline_images=['violinplot_vert_showextrema'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.23)
 def test_vert_violinplot_showextrema():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(5))
@@ -2490,7 +2489,7 @@ def test_vert_violinplot_showextrema():
 @image_comparison(baseline_images=['violinplot_vert_showmedians'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.23)
 def test_vert_violinplot_showmedians():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(7))
@@ -2501,7 +2500,7 @@ def test_vert_violinplot_showmedians():
 @image_comparison(baseline_images=['violinplot_vert_showall'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.2)
 def test_vert_violinplot_showall():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(11))
@@ -2512,7 +2511,7 @@ def test_vert_violinplot_showall():
 @image_comparison(baseline_images=['violinplot_vert_custompoints_10'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.22)
 def test_vert_violinplot_custompoints_10():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(13))
@@ -2523,7 +2522,7 @@ def test_vert_violinplot_custompoints_10():
 @image_comparison(baseline_images=['violinplot_vert_custompoints_200'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.22)
 def test_vert_violinplot_custompoints_200():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(17))
@@ -2534,7 +2533,7 @@ def test_vert_violinplot_custompoints_200():
 @image_comparison(baseline_images=['violinplot_horiz_baseline'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.2)
 def test_horiz_violinplot_baseline():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(19))
@@ -2545,7 +2544,7 @@ def test_horiz_violinplot_baseline():
 @image_comparison(baseline_images=['violinplot_horiz_showmedians'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.23)
 def test_horiz_violinplot_showmedians():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(23))
@@ -2556,7 +2555,7 @@ def test_horiz_violinplot_showmedians():
 @image_comparison(baseline_images=['violinplot_horiz_showmeans'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.25)
 def test_horiz_violinplot_showmeans():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(29))
@@ -2567,7 +2566,7 @@ def test_horiz_violinplot_showmeans():
 @image_comparison(baseline_images=['violinplot_horiz_showextrema'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.2)
 def test_horiz_violinplot_showextrema():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(31))
@@ -2578,7 +2577,7 @@ def test_horiz_violinplot_showextrema():
 @image_comparison(baseline_images=['violinplot_horiz_showall'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.19)
 def test_horiz_violinplot_showall():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(37))
@@ -2589,7 +2588,7 @@ def test_horiz_violinplot_showall():
 @image_comparison(baseline_images=['violinplot_horiz_custompoints_10'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.22)
 def test_horiz_violinplot_custompoints_10():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(41))
@@ -2600,7 +2599,7 @@ def test_horiz_violinplot_custompoints_10():
 @image_comparison(baseline_images=['violinplot_horiz_custompoints_200'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.22)
 def test_horiz_violinplot_custompoints_200():
     ax = plt.axes()
     # First 9 digits of frac(sqrt(43))
@@ -3944,7 +3943,7 @@ def test_psd_noise():
 @image_comparison(baseline_images=['csd_freqs'], remove_text=True,
 -                  extensions=['png'], tol=0.002)
 +                  extensions=['png'], tol=0.21)
 def test_csd_freqs():
     '''test axes.csd with sinusoidal stimuli'''
     n = 10000
@@ -4803,7 +4802,7 @@ def test_rc_spines():
 @image_comparison(baseline_images=['rc_grid'], extensions=['png'],
 -                  savefig_kwarg={'dpi': 40})
 +                  savefig_kwarg={'dpi': 40}, tol=0.2)
 def test_rc_grid():
     fig = plt.figure()
     rc_dict0 = {
@@ -5298,7 +5297,7 @@ def test_date_timezone_y():
 @image_comparison(baseline_images=['date_timezone_x_and_y'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=3.05)
 def test_date_timezone_x_and_y():
     # Tests issue 5575
     time_index = [pytz.timezone('UTC').localize(datetime.datetime(
 diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
 index 291647d17..265f23fed 100644
 --- a/lib/matplotlib/tests/test_collections.py
 +++ b/lib/matplotlib/tests/test_collections.py
@@ -467,7 +467,7 @@ def test_EllipseCollection():
 @image_comparison(baseline_images=['polycollection_close'],
 -                  extensions=['png'], remove_text=True)
 +                  extensions=['png'], remove_text=True, tol=0.45)
 def test_polycollection_close():
     from mpl_toolkits.mplot3d import Axes3D
 diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
 index 12a9bed3b..86d2358fb 100644
 --- a/lib/matplotlib/tests/test_colorbar.py
 +++ b/lib/matplotlib/tests/test_colorbar.py
@@ -95,7 +95,7 @@ def _colorbar_extension_length(spacing):
 @image_comparison(
         baseline_images=['colorbar_extensions_shape_uniform',
                          'colorbar_extensions_shape_proportional'],
 -        extensions=['png'])
 +        extensions=['png'], tol=0.16)
 def test_colorbar_extension_shape():
     '''Test rectangular colorbar extensions.'''
     # Create figures for uniform and proportionally spaced colorbars.
@@ -105,7 +105,7 @@ def test_colorbar_extension_shape():
 @image_comparison(baseline_images=['colorbar_extensions_uniform',
                                    'colorbar_extensions_proportional'],
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.25)
 def test_colorbar_extension_length():
     '''Test variable length colorbar extensions.'''
     # Create figures for uniform and proportionally spaced colorbars.
@@ -119,7 +119,7 @@ def test_colorbar_extension_length():
                                    'cbar_sharing',
                                    ],
                   extensions=['png'], remove_text=True,
 -                  savefig_kwarg={'dpi': 40})
 +                  savefig_kwarg={'dpi': 40}, tol=0.17)
 def test_colorbar_positioning():
     data = np.arange(1200).reshape(30, 40)
     levels = [0, 200, 400, 600, 800, 1000, 1200]
@@ -173,7 +173,7 @@ def test_colorbar_positioning():
 @image_comparison(baseline_images=['cbar_with_subplots_adjust'],
                   extensions=['png'], remove_text=True,
 -                  savefig_kwarg={'dpi': 40})
 +                  savefig_kwarg={'dpi': 40}, tol=0.17)
 def test_gridspec_make_colorbar():
     plt.figure()
     data = np.arange(1200).reshape(30, 40)
@@ -232,7 +232,8 @@ def test_colorbarbase():
 @image_comparison(
     baseline_images=['colorbar_closed_patch'],
 -    remove_text=True)
 +    remove_text=True,
 +    tol=0.22)
 def test_colorbar_closed_patch():
     fig = plt.figure(figsize=(8, 6))
     ax1 = fig.add_axes([0.05, 0.85, 0.9, 0.1])
 diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
 index fcf633a08..cad431771 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -295,7 +295,7 @@ def test_constrained_layout12():
     ax.set_xlabel('x-label')
 -@image_comparison(baseline_images=['constrained_layout13'], tol=2.e-2,
 +@image_comparison(baseline_images=['constrained_layout13'], tol=3.e-2,
         extensions=['png'])
 def test_constrained_layout13():
     'Test that padding works.'
 diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
 index 42903ac68..f03a5d0af 100644
 --- a/lib/matplotlib/tests/test_contour.py
 +++ b/lib/matplotlib/tests/test_contour.py
@@ -217,7 +217,7 @@ def test_given_colors_levels_and_extends():
 @image_comparison(baseline_images=['contour_datetime_axis'],
 -                  extensions=['png'], remove_text=False)
 +                  extensions=['png'], remove_text=False, tol=0.18)
 def test_contour_datetime_axis():
     fig = plt.figure()
     fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15)
@@ -243,7 +243,7 @@ def test_contour_datetime_axis():
 @image_comparison(baseline_images=['contour_test_label_transforms'],
 -                  extensions=['png'], remove_text=True)
 +                  extensions=['png'], remove_text=True, tol=1.38)
 def test_labels():
     # Adapted from pylab_examples example code: contour_demo.py
     # see issues #2475, #2843, and #2818 for explanation
@@ -274,7 +274,7 @@ def test_labels():
 @image_comparison(baseline_images=['contour_corner_mask_False',
                                    'contour_corner_mask_True'],
 -                  extensions=['png'], remove_text=True)
 +                  extensions=['png'], remove_text=True, tol=0.19)
 def test_corner_mask():
     n = 60
     mask_level = 0.95
 diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
 index c8a23347f..5a23ded19 100644
 --- a/lib/matplotlib/tests/test_image.py
 +++ b/lib/matplotlib/tests/test_image.py
@@ -761,7 +761,7 @@ def test_imshow_endianess():
 @image_comparison(baseline_images=['imshow_masked_interpolation'],
 -                  remove_text=True, style='mpl20')
 +                  remove_text=True, style='mpl20', tol=0.25)
 def test_imshow_masked_interpolation():
     cm = copy(plt.get_cmap('viridis'))
 diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
 index af6701a0f..151b061a5 100644
 --- a/lib/matplotlib/tests/test_mathtext.py
 +++ b/lib/matplotlib/tests/test_mathtext.py
@@ -173,7 +173,7 @@ def baseline_images(request, fontset, index):
                          ['cm', 'stix', 'stixsans', 'dejavusans',
                           'dejavuserif'])
 @pytest.mark.parametrize('baseline_images', ['mathtext'], indirect=True)
 -@image_comparison(baseline_images=None)
 +@image_comparison(baseline_images=None, tol=0.31)
 def test_mathtext_rendering(baseline_images, fontset, index, test):
     matplotlib.rcParams['mathtext.fontset'] = fontset
     fig = plt.figure(figsize=(5.25, 0.75))
@@ -187,7 +187,7 @@ def test_mathtext_rendering(baseline_images, fontset, index, test):
                          ['cm', 'stix', 'stixsans', 'dejavusans',
                           'dejavuserif'])
 @pytest.mark.parametrize('baseline_images', ['mathfont'], indirect=True)
 -@image_comparison(baseline_images=None, extensions=['png'])
 +@image_comparison(baseline_images=None, extensions=['png'], tol=0.3)
 def test_mathfont_rendering(baseline_images, fontset, index, test):
     matplotlib.rcParams['mathtext.fontset'] = fontset
     fig = plt.figure(figsize=(5.25, 0.75))
 diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
 index ff1abb9c6..cc90e6bb0 100644
 --- a/lib/matplotlib/tests/test_patches.py
 +++ b/lib/matplotlib/tests/test_patches.py
@@ -266,9 +266,8 @@ def test_wedge_movement():
         assert getattr(w, attr) == new_v
 -# png needs tol>=0.06, pdf tol>=1.617
 @image_comparison(baseline_images=['wedge_range'],
 -                  remove_text=True, tol=1.65 if on_win else 0)
 +                  remove_text=True)
 def test_wedge_range():
     ax = plt.axes()
 diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
 index fe7265957..2addc35ed 100644
 --- a/lib/matplotlib/tests/test_patheffects.py
 +++ b/lib/matplotlib/tests/test_patheffects.py
@@ -121,7 +121,7 @@ def test_SimplePatchShadow_offset():
     assert pe._offset == (4, 5)
 -@image_comparison(baseline_images=['collection'], tol=0.02)
 +@image_comparison(baseline_images=['collection'], tol=0.084)
 def test_collection():
     x, y = np.meshgrid(np.linspace(0, 10, 150), np.linspace(-5, 5, 100))
     data = np.sin(x) + np.cos(y)
 diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
 index 89a5a512e..a25961284 100644
 --- a/lib/matplotlib/tests/test_pickle.py
 +++ b/lib/matplotlib/tests/test_pickle.py
@@ -42,7 +42,7 @@ def test_simple():
 @image_comparison(baseline_images=['multi_pickle'],
                   extensions=['png'], remove_text=True,
 -                  style='mpl20')
 +                  style='mpl20', tol=0.11)
 def test_complete():
     fig = plt.figure('Figure with a label?', figsize=(10, 6))
 diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
 index a0e1e674f..ede6bfc64 100644
 --- a/lib/matplotlib/tests/test_quiver.py
 +++ b/lib/matplotlib/tests/test_quiver.py
@@ -131,7 +131,7 @@ def test_quiver_key_pivot():
 @image_comparison(baseline_images=['barbs_test_image'],
 -                  extensions=['png'], remove_text=True)
 +                  extensions=['png'], remove_text=True, tol=0.11)
 def test_barbs():
     x = np.linspace(-5, 5, 5)
     X, Y = np.meshgrid(x, x)
 diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
 index 4f70ce861..5bc8184f7 100644
 --- a/lib/matplotlib/tests/test_streamplot.py
 +++ b/lib/matplotlib/tests/test_streamplot.py
@@ -39,8 +39,7 @@ def test_startpoints():
     plt.plot(start_x, start_y, 'ok')
 -@image_comparison(baseline_images=['streamplot_colormap'],
 -                  tol=.02)
 +@image_comparison(baseline_images=['streamplot_colormap'])
 def test_colormap():
     X, Y, U, V = velocity_field()
     plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2,
 diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
 index 06985db84..8efaef898 100644
 --- a/lib/matplotlib/tests/test_transforms.py
 +++ b/lib/matplotlib/tests/test_transforms.py
@@ -74,7 +74,7 @@ def test_external_transform_api():
 @image_comparison(baseline_images=['pre_transform_data'],
 -                  tol=0.08)
 +                  tol=0.155)
 def test_pre_transform_plotting():
     # a catch-all for as many as possible plot layouts which handle
     # pre-transforming the data NOTE: The axis range is important in this
 diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
 index de7226609..2676fc842 100644
 --- a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
 +++ b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py
@@ -24,7 +24,7 @@ def test_subplot():
 @image_comparison(baseline_images=['curvelinear3'],
 -                  extensions=['png'], style='default', tol=0.01)
 +                  extensions=['png'], style='default', tol=0.02)
 def test_curvelinear3():
     fig = plt.figure(figsize=(5, 5))
     fig.clf()
@@ -80,7 +80,7 @@ def test_curvelinear3():
 @image_comparison(baseline_images=['curvelinear4'],
 -                  extensions=['png'], style='default', tol=0.01)
 +                  extensions=['png'], style='default', tol=0.055)
 def test_curvelinear4():
     fig = plt.figure(figsize=(5, 5))
     fig.clf()
 diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
 index a7c637428..e22f4ac3e 100644
 --- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
 +++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -19,7 +19,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
 @image_comparison(baseline_images=['custom_transform'],
 -                  extensions=['png'], style='default', tol=0.03)
 +                  extensions=['png'], style='default', tol=0.035)
 def test_custom_transform():
     class MyTransform(Transform):
         input_dims = 2
@@ -91,7 +91,7 @@ def test_custom_transform():
 @image_comparison(baseline_images=['polar_box'],
 -                  extensions=['png'], style='default', tol=0.03)
 +                  extensions=['png'], style='default', tol=0.08)
 def test_polar_box():
     fig = plt.figure(figsize=(5, 5))
@@ -152,7 +152,7 @@ def test_polar_box():
 @image_comparison(baseline_images=['axis_direction'],
 -                  extensions=['png'], style='default', tol=0.03)
 +                  extensions=['png'], style='default', tol=0.05)
 def test_axis_direction():
     fig = plt.figure(figsize=(5, 5))
 diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
 index d6e57b9b4..c3ac37a7f 100644
 --- a/lib/mpl_toolkits/tests/test_mplot3d.py
 +++ b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -226,7 +226,7 @@ def test_text3d():
     ax.set_zlabel('Z axis')
 -@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.03)
 +@image_comparison(baseline_images=['trisurf3d'], remove_text=True, tol=0.05)
 def test_trisurf3d():
     n_angles = 36
     n_radii = 8
@@ -705,7 +705,7 @@ class TestVoxels(object):
     @image_comparison(
         baseline_images=['voxels-xyz'],
         extensions=['png'],
 -        tol=0.01
 +        tol=0.02
     )
     def test_xyz(self):
         fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
 -- 
 2.20.1
--- a/0003-Increase-some-tolerances-for-non-x86-arches.patch
+++ b/0003-Increase-some-tolerances-for-non-x86-arches.patch
@@ -1,278 +0,0 @@
 From 8f2ae0000d8f593fc82243b056ecf57c81059a42 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Sat, 31 Mar 2018 00:33:37 -0400
 Subject: [PATCH 3/3] Increase some tolerances for non-x86 arches.
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---
 lib/matplotlib/tests/test_arrow_patches.py                 | 4 ++--
 lib/matplotlib/tests/test_axes.py                          | 7 ++++---
 lib/matplotlib/tests/test_backends_interactive.py          | 2 +-
 lib/matplotlib/tests/test_collections.py                   | 2 +-
 lib/matplotlib/tests/test_constrainedlayout.py             | 2 +-
 lib/matplotlib/tests/test_cycles.py                        | 6 +++---
 lib/matplotlib/tests/test_figure.py                        | 2 +-
 lib/matplotlib/tests/test_image.py                         | 2 +-
 lib/matplotlib/tests/test_legend.py                        | 6 +++---
 lib/matplotlib/tests/test_pickle.py                        | 2 +-
 lib/matplotlib/tests/test_scale.py                         | 2 +-
 lib/matplotlib/tests/test_streamplot.py                    | 2 +-
 lib/matplotlib/tests/test_units.py                         | 4 ++--
 .../tests/test_axisartist_grid_helper_curvelinear.py       | 2 +-
 14 files changed, 23 insertions(+), 22 deletions(-)
 diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
 index 44f87c5fe..fb50ae710 100644
 --- a/lib/matplotlib/tests/test_arrow_patches.py
 +++ b/lib/matplotlib/tests/test_arrow_patches.py
@@ -68,7 +68,7 @@ def __prepare_fancyarrow_dpi_cor_test():
 @image_comparison(baseline_images=['fancyarrow_dpi_cor_100dpi'],
 -                  remove_text=True, extensions=['png'],
 +                  remove_text=True, extensions=['png'], tol=0.016,
                   savefig_kwarg=dict(dpi=100))
 def test_fancyarrow_dpi_cor_100dpi():
     """
@@ -83,7 +83,7 @@ def test_fancyarrow_dpi_cor_100dpi():
 @image_comparison(baseline_images=['fancyarrow_dpi_cor_200dpi'],
 -                  remove_text=True, extensions=['png'],
 +                  remove_text=True, extensions=['png'], tol=0.019,
                   savefig_kwarg=dict(dpi=200))
 def test_fancyarrow_dpi_cor_200dpi():
     """
 diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
 index dde856669..de1632fc4 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
@@ -389,7 +389,7 @@ def test_annotate_default_arrow():
     assert ann.arrow_patch is not None
 -@image_comparison(baseline_images=['polar_axes'], style='default')
 +@image_comparison(baseline_images=['polar_axes'], style='default', tol=0.01)
 def test_polar_annotations():
     # you can specify the xypoint and the xytext in different
     # positions and coordinate systems, and optionally turn on a
@@ -3264,7 +3264,8 @@ def test_vertex_markers():
 @image_comparison(baseline_images=['vline_hline_zorder',
 -                                   'errorbar_zorder'])
 +                                   'errorbar_zorder'],
 +                  tol=0.02)
 def test_eb_line_zorder():
     x = list(xrange(10))
@@ -4997,7 +4998,7 @@ def test_title_location_roundtrip():
 @image_comparison(baseline_images=["loglog"], remove_text=True,
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.009)
 def test_loglog():
     fig, ax = plt.subplots()
     x = np.arange(1, 11)
 diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
 index 8cd4585bf..29b2c4b46 100644
 --- a/lib/matplotlib/tests/test_backends_interactive.py
 +++ b/lib/matplotlib/tests/test_backends_interactive.py
@@ -57,4 +57,4 @@ def test_backend(backend):
     environ["MPLBACKEND"] = backend
     proc = Popen([sys.executable, "-c", _test_script], env=environ)
     # Empirically, 1s is not enough on Travis.
 -    assert proc.wait(timeout=10) == 0
 +    assert proc.wait(timeout=30) == 0
 diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
 index 291647d17..6b623ef52 100644
 --- a/lib/matplotlib/tests/test_collections.py
 +++ b/lib/matplotlib/tests/test_collections.py
@@ -443,7 +443,7 @@ def test_barb_limits():
 @image_comparison(baseline_images=['EllipseCollection_test_image'],
 -                  extensions=['png'],
 +                  extensions=['png'], tol=0.012,
                   remove_text=True)
 def test_EllipseCollection():
     # Test basic functionality
 diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
 index fcf633a08..725365d2e 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -222,7 +222,7 @@ def test_constrained_layout9():
 @image_comparison(baseline_images=['constrained_layout10'],
 -        extensions=['png'])
 +        extensions=['png'], tol=0.01)
 def test_constrained_layout10():
     'Test for handling legend outside axis'
     fig, axs = plt.subplots(2, 2, constrained_layout=True)
 diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
 index dfa0f7c79..ac605c8ab 100644
 --- a/lib/matplotlib/tests/test_cycles.py
 +++ b/lib/matplotlib/tests/test_cycles.py
@@ -10,7 +10,7 @@ from cycler import cycler
 @image_comparison(baseline_images=['color_cycle_basic'], remove_text=True,
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.008)
 def test_colorcycle_basic():
     fig, ax = plt.subplots()
     ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']))
@@ -27,7 +27,7 @@ def test_colorcycle_basic():
 @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
 -                  remove_text=True, extensions=['png'])
 +                  remove_text=True, extensions=['png'], tol=0.008)
 def test_marker_cycle():
     fig, ax = plt.subplots()
     ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
@@ -60,7 +60,7 @@ def test_marker_cycle():
 @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
 -                  extensions=['png'])
 +                  extensions=['png'], tol=0.009)
 def test_linestylecycle_basic():
     fig, ax = plt.subplots()
     ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
 diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
 index 69752e17d..e7c57d470 100644
 --- a/lib/matplotlib/tests/test_figure.py
 +++ b/lib/matplotlib/tests/test_figure.py
@@ -14,7 +14,7 @@ import numpy as np
 import pytest
 -@image_comparison(baseline_images=['figure_align_labels'])
 +@image_comparison(baseline_images=['figure_align_labels'], tol=0.01)
 def test_align_labels():
     # Check the figure.align_labels() command
     fig = plt.figure(tight_layout=True)
 diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
 index c8a23347f..afb36587c 100644
 --- a/lib/matplotlib/tests/test_image.py
 +++ b/lib/matplotlib/tests/test_image.py
@@ -761,7 +761,7 @@ def test_imshow_endianess():
 @image_comparison(baseline_images=['imshow_masked_interpolation'],
 -                  remove_text=True, style='mpl20')
 +                  remove_text=True, style='mpl20', tol=0.006)
 def test_imshow_masked_interpolation():
     cm = copy(plt.get_cmap('viridis'))
 diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
 index 55b8adc77..1784ff966 100644
 --- a/lib/matplotlib/tests/test_legend.py
 +++ b/lib/matplotlib/tests/test_legend.py
@@ -145,7 +145,7 @@ def test_multiple_keys():
 @image_comparison(baseline_images=['rgba_alpha'],
 -                  extensions=['png'], remove_text=True)
 +                  extensions=['png'], remove_text=True, tol=0.007)
 def test_alpha_rgba():
     import matplotlib.pyplot as plt
@@ -156,7 +156,7 @@ def test_alpha_rgba():
 @image_comparison(baseline_images=['rcparam_alpha'],
 -                  extensions=['png'], remove_text=True)
 +                  extensions=['png'], remove_text=True, tol=0.007)
 def test_alpha_rcparam():
     import matplotlib.pyplot as plt
@@ -183,7 +183,7 @@ def test_fancy():
                ncol=2, shadow=True, title="My legend", numpoints=1)
 -@image_comparison(baseline_images=['framealpha'], remove_text=True)
 +@image_comparison(baseline_images=['framealpha'], remove_text=True, tol=0.018)
 def test_framealpha():
     x = np.linspace(1, 100, 100)
     y = x
 diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
 index 89a5a512e..99051dee7 100644
 --- a/lib/matplotlib/tests/test_pickle.py
 +++ b/lib/matplotlib/tests/test_pickle.py
@@ -42,7 +42,7 @@ def test_simple():
 @image_comparison(baseline_images=['multi_pickle'],
                   extensions=['png'], remove_text=True,
 -                  style='mpl20')
 +                  style='mpl20', tol=0.004)
 def test_complete():
     fig = plt.figure('Figure with a label?', figsize=(10, 6))
 diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
 index dd5b18182..ebebb0525 100644
 --- a/lib/matplotlib/tests/test_scale.py
 +++ b/lib/matplotlib/tests/test_scale.py
@@ -96,7 +96,7 @@ def test_logscale_transform_repr():
 @image_comparison(baseline_images=['logscale_nonpos_values'], remove_text=True,
 -                  extensions=['png'], style='mpl20')
 +                  extensions=['png'], style='mpl20', tol=0.008)
 def test_logscale_nonpos_values():
     np.random.seed(19680801)
     xs = np.random.normal(size=int(1e3))
 diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py
 index 4f70ce861..4e52ed0c4 100644
 --- a/lib/matplotlib/tests/test_streamplot.py
 +++ b/lib/matplotlib/tests/test_streamplot.py
@@ -48,7 +48,7 @@ def test_colormap():
     plt.colorbar()
 -@image_comparison(baseline_images=['streamplot_linewidth'])
 +@image_comparison(baseline_images=['streamplot_linewidth'], tol=0.002)
 def test_linewidth():
     X, Y, U, V = velocity_field()
     speed = np.sqrt(U*U + V*V)
 diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
 index 65c8da7ea..c69d1d531 100644
 --- a/lib/matplotlib/tests/test_units.py
 +++ b/lib/matplotlib/tests/test_units.py
@@ -43,7 +43,7 @@ class Quantity(object):
 # Tests that the conversion machinery works properly for classes that
 # work as a facade over numpy arrays (like pint)
 -@image_comparison(baseline_images=['plot_pint'],
 +@image_comparison(baseline_images=['plot_pint'], tol=0.003,
                   extensions=['png'], remove_text=False, style='mpl20')
 def test_numpy_facade():
     # Create an instance of the conversion interface and
@@ -87,7 +87,7 @@ def test_numpy_facade():
 # Tests gh-8908
 -@image_comparison(baseline_images=['plot_masked_units'],
 +@image_comparison(baseline_images=['plot_masked_units'], tol=0.007,
                   extensions=['png'], remove_text=True, style='mpl20')
 def test_plot_masked_units():
     data = np.linspace(-5, 5)
 diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
 index a7c637428..8fc5b25b1 100644
 --- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
 +++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
@@ -91,7 +91,7 @@ def test_custom_transform():
 @image_comparison(baseline_images=['polar_box'],
 -                  extensions=['png'], style='default', tol=0.03)
 +                  extensions=['png'], style='default', tol=0.04)
 def test_polar_box():
     fig = plt.figure(figsize=(5, 5))
 -- 
 2.20.1
--- a/20_matplotlibrc_path_search_fix.patch
+++ b/20_matplotlibrc_path_search_fix.patch
@@ -0,0 +1,29 @@
 Description: Fixes the path to search for matplotlibrc file
 Forwarded: not-needed
 Author: Sandro Tosi <morph@debian.org>
 --- a/lib/matplotlib/__init__.py
 +++ b/lib/matplotlib/__init__.py
@@ -658,10 +658,12 @@ def _get_data_path():
             raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
         return path
 -    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
 +    path = '/usr/share/matplotlib/mpl-data'
     if os.path.isdir(path):
         return path
 +    raise RuntimeError('Could not find the matplotlib data files')
 +
     # setuptools' namespace_packages may highjack this init file
     # so need to try something known to be in matplotlib, not basemap
     import matplotlib.afm
@@ -786,7 +788,7 @@ def matplotlib_fname():
                     home, '.matplotlib', 'matplotlibrc')
             return fname
 -    path = get_data_path()  # guaranteed to exist or raise
 +    path = '/etc'  # guaranteed to exist or raise
     fname = os.path.join(path, 'matplotlibrc')
     if not os.path.exists(fname):
         warnings.warn('Could not find matplotlibrc; using defaults')
--- a/40_bts608939_draw_markers_description.patch
+++ b/40_bts608939_draw_markers_description.patch
@@ -0,0 +1,14 @@
 Description: minor glitch in draw_markers() description
 Author: Jakub Wilk <jwilk@debian.org>
 --- a/doc/api/api_changes.rst
 +++ b/doc/api/api_changes.rst
@@ -1143,7 +1143,7 @@ New methods:
   * :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
     trans, rgbFace)
 -    <matplotlib.backend_bases.RendererBase.draw_markers`
 +    <matplotlib.backend_bases.RendererBase.draw_markers>`
   * :meth:`draw_path_collection(self, master_transform, cliprect,
     clippath, clippath_trans, paths, all_transforms, offsets,
--- a/50_bts608942_spaces_in_param_args.patch
+++ b/50_bts608942_spaces_in_param_args.patch
@@ -0,0 +1,50 @@
 Description: don't separate param and its argument with a space
 --- a/lib/mpl_toolkits/axes_grid1/axes_divider.py
 +++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -201,12 +201,12 @@ class Divider(object):
     def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
         """
 -        :param nx, nx1: Integers specifying the column-position of the
 +        :param nx,nx1: Integers specifying the column-position of the
           cell. When nx1 is None, a single nx-th column is
           specified. Otherwise location of columns spanning between nx
           to nx1 (but excluding nx1-th column) is specified.
 -        :param ny, ny1: same as nx and nx1, but for row positions.
 +        :param ny,ny1: same as nx and nx1, but for row positions.
         """
         figW, figH = self._fig.get_size_inches()
@@ -250,12 +250,12 @@ class Divider(object):
         (:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
         specified cell.
 -        :param nx, nx1: Integers specifying the column-position of the
 +        :param nx,nx1: Integers specifying the column-position of the
           cell. When nx1 is None, a single nx-th column is
           specified. Otherwise location of columns spanning between nx
           to nx1 (but excluding nx1-th column) is specified.
 -        :param ny, ny1: same as nx and nx1, but for row positions.
 +        :param ny,ny1: same as nx and nx1, but for row positions.
         """
         return AxesLocator(self, nx, ny, nx1, ny1)
@@ -298,12 +298,12 @@ class AxesLocator(object):
         """
         :param axes_divider: An instance of AxesDivider class.
 -        :param nx, nx1: Integers specifying the column-position of the
 +        :param nx,nx1: Integers specifying the column-position of the
           cell. When nx1 is None, a single nx-th column is
           specified. Otherwise location of columns spanning between nx
           to nx1 (but excluding nx1-th column) is is specified.
 -        :param ny, ny1: same as nx and nx1, but for row positions.
 +        :param ny,ny1: same as nx and nx1, but for row positions.
         """
         self._axes_divider = axes_divider
--- a/70_bts720549_try_StayPuft_for_xkcd.patch
+++ b/70_bts720549_try_StayPuft_for_xkcd.patch
@@ -0,0 +1,19 @@
 Description: Try to use also StayPuft (a free font) for xkcd
 Author: Sandro Tosi <morph@debian.org>
 Origin: vendor
 Bug: http://bugs.debian.org/720549
 Forwarded: not-needed
 Last-Update: 2013-10-06
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/lib/matplotlib/pyplot.py
 +++ b/lib/matplotlib/pyplot.py
@@ -301,7 +301,7 @@ def xkcd(scale=1, length=100, randomness
     from matplotlib import patheffects
     context = rc_context()
     try:
 -        rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS']
 +        rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS', 'StayPuft']
         rcParams['font.size'] = 14.0
         rcParams['path.sketch'] = (scale, length, randomness)
         rcParams['path.effects'] = [
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -0,0 +1,21 @@
 #! /bin/sh
 version=$1
 [ -z $version ] && exit 1
 dir=matplotlib-${version}
 file=matplotlib-${version}.tar.gz
 file=v${version}.tar.gz
 result=matplotlib-${version}-without-extern.tar.xz
 test -f $file || wget -v https://github.com/matplotlib/matplotlib/archive/$file
 rm -rf matplotlib-${version}
 tar xzf $file
 rm -vr matplotlib-${version}/extern/qhull
 rm -vr matplotlib-${version}/lib/matplotlib/mpl-data/sample_data/lena.*
 rm -f $result
 tar cJf $result $dir
--- a/matplotlib-1.4.3-cbook.restrict_dict.patch
+++ b/matplotlib-1.4.3-cbook.restrict_dict.patch
@@ -0,0 +1,32 @@
 From 2e445c2c4f66f1e0de9779a3fd966aaf8d8ed2c5 Mon Sep 17 00:00:00 2001
 From: Thomas A Caswell <tcaswell@gmail.com>
 Date: Sun, 17 May 2015 23:45:44 -0400
 Subject: [PATCH] Merge pull request #4439 from tswsl1989/restrict_dict_gdk
 FIX : Import cbook.restrict_dict into backend_gdk
 ---
 lib/matplotlib/backends/backend_gdk.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
 index fc705fe..024c27e 100644
 --- a/lib/matplotlib/backends/backend_gdk.py
 +++ b/lib/matplotlib/backends/backend_gdk.py
@@ -26,7 +26,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
      FigureManagerBase, FigureCanvasBase
 -from matplotlib.cbook import is_string_like
 +from matplotlib.cbook import is_string_like, restrict_dict
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
 from matplotlib.transforms import Affine2D
@@ -477,7 +477,7 @@ def _print_image(self, filename, format, *args, **kwargs):
         # set the default quality, if we are writing a JPEG.
         # http://www.pygtk.org/docs/pygtk/class-gdkpixbuf.html#method-gdkpixbuf--save
 -        options = cbook.restrict_dict(kwargs, ['quality'])
 +        options = restrict_dict(kwargs, ['quality'])
         if format in ['jpg','jpeg']:
            if 'quality' not in options:
               options['quality'] = rcParams['savefig.jpeg_quality']
--- a/python-matplotlib-noagg.patch
+++ b/python-matplotlib-noagg.patch
@@ -0,0 +1,33 @@
 --- setupext.py.orig	2013-08-02 09:39:43.914247832 +0200
 +++ setupext.py	2013-08-02 09:40:14.785304342 +0200
@@ -914,28 +914,13 @@ class LibAgg(SetupPackage):
         self.__class__.found_external = True
         try:
             return self._check_for_pkg_config(
 -                'libagg', 'agg2/agg_basics.h', min_version='PATCH')
 +                'libagg', 'agg2/agg_basics.h', min_version='2.5.0')
         except CheckFailed as e:
             self.__class__.found_external = False
             return str(e) + ' Using local copy.'
     def add_flags(self, ext):
 -        if self.found_external:
 -            pkg_config.setup_extension(ext, 'libagg')
 -        else:
 -            ext.include_dirs.append('extern/agg24/include')
 -            agg_sources = [
 -                'agg_bezier_arc.cpp',
 -                'agg_curves.cpp',
 -                'agg_image_filters.cpp',
 -                'agg_trans_affine.cpp',
 -                'agg_vcgen_contour.cpp',
 -                'agg_vcgen_dash.cpp',
 -                'agg_vcgen_stroke.cpp',
 -                'agg_vpgen_segmentator.cpp'
 -                ]
 -            ext.sources.extend(
 -                os.path.join('extern', 'agg24', 'src', x) for x in agg_sources)
 +        pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
 class FreeType(SetupPackage):
--- a/python-matplotlib-system-cxx.patch
+++ b/python-matplotlib-system-cxx.patch
@@ -0,0 +1,18 @@
 --- setupext.py.orig	2014-01-25 15:06:39.460916454 +0100
 +++ setupext.py	2014-01-25 15:06:53.080946205 +0100
@@ -841,15 +841,6 @@
     name = 'pycxx'
     def check(self):
 -        if PY3:
 -            # There is no version of PyCXX in the wild that will work
 -            # with Python 3.x and matplotlib, since they lack support
 -            # for the buffer object.
 -            self.__class__.found_external = False
 -            return ("Official versions of PyCXX are not compatible "
 -                    "with matplotlib on Python 3.x, since they lack "
 -                    "support for the buffer object.  Using local "
 -                    "copy")
         self.__class__.found_external = True
         old_stdout = sys.stdout
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -1,12 +1,26 @@
-%global with_html               0
+%if 0%{?fedora} >= 18
 %global with_python3            1
 %global basepy3dir              %(echo ../`basename %{py3dir}`)
 %else
 %global with_python3            0
 %endif
 %global __provides_exclude_from .*/site-packages/.*\\.so$
 %global with_html               1
 %global run_tests               0
-# It seems like there's some kind of weird occasional error where a
+# On RHEL 7 onwards, don't build with wx:
-# build (often aarch64 or ppc64) will fail in one of the Stix font
+%if 0%{?rhel} >= 7
-# tests with a huge RMS difference, but if you run the same build again,
+%global with_wx 0
-# you won't get the same error. Unless someone can figure out what's
+%else
-# going on, we just have to keep re-running the build until it doesn't
+%global with_wx 1
-# happen.
+%endif
-%global run_tests               1
+
 # On Fedora 21 onwards, enable Qt5 backend:
 %if 0%{?fedora} >= 21
 %global with_qt5 1
 %else
 %global with_qt5 0
 %endif
 # the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
 # CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
@@ -30,53 +44,48 @@
 # Use the same directory of the main package for subpackage licence and docs
 %global _docdir_fmt %{name}
 #global rctag rc1
 # Updated test images for new FreeType.
 %global mpl_images_version 2.2.3
 # The version of FreeType in this Fedora branch.
 %if %{fedora} >= 29
 %global ftver 2.9.1
 %else
 %global ftver 2.8
 %endif
 Name:           python-matplotlib
-Version:        2.2.4
+Version:        1.4.3
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Release:        14%{?dist}
 Summary:        Python 2D plotting library
 Group:          Development/Libraries
 # qt4_editor backend is MIT
 License:        Python and MIT
 URL:            http://matplotlib.org
-Source0:        https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}/matplotlib-%{version}%{?rctag}.tar.gz
+#Modified Sources to remove the bundled libraries
 Source0:        matplotlib-%{version}-without-extern.tar.xz
 Source1:        setup.cfg
-# Because the qhull package stopped shipping pkgconfig files.
+Patch0:         %{name}-noagg.patch
-# https://src.fedoraproject.org/rpms/qhull/pull-request/1
+Patch1:         %{name}-system-cxx.patch
-Patch0001:      0001-Force-using-system-qhull.patch
+Patch2:         20_matplotlibrc_path_search_fix.patch
-
+Patch3:         40_bts608939_draw_markers_description.patch
-# Don't attempt to download jQuery and jQuery UI
+Patch4:         50_bts608942_spaces_in_param_args.patch
-Patch0002:      0001-Use-packaged-jquery-and-jquery-ui.patch
+Patch5:         70_bts720549_try_StayPuft_for_xkcd.patch
-
+Patch6:         matplotlib-1.4.3-cbook.restrict_dict.patch
 # Fedora-specific patches; see:
 # https://github.com/QuLogic/matplotlib/tree/fedora-patches
 # https://github.com/QuLogic/matplotlib/tree/fedora-patches-non-x86
 # Updated test images for new FreeType.
 Source1000:     https://github.com/QuLogic/mpl-images/archive/v%{mpl_images_version}-with-freetype-%{ftver}/matplotlib-%{mpl_images_version}-with-freetype-%{ftver}.tar.gz
 # Search in /etc/matplotlibrc:
 Patch1001:      0001-matplotlibrc-path-search-fix.patch
 # Image tolerances for anything but x86_64:
 Patch1002:      0002-Increase-tolerances-for-non-x86_64-arches.patch
 # Image tolerances for 32-bit systems: i686 armv7hl
 Patch1003:      0003-Increase-some-tolerances-for-32-bit-systems.patch
 # Image tolerances for 64-bit (but not x86_64) systems: aarch64 ppc64(le) s390x
 Patch1004:      0003-Increase-some-tolerances-for-non-x86-arches.patch
 BuildRequires:  agg-devel
 BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  qhull-devel
-BuildRequires:  texlive-cm
+BuildRequires:  python-six
 BuildRequires:  numpy
 BuildRequires:  pyparsing
 BuildRequires:  python-pycxx-devel
 BuildRequires:  python-dateutil
 BuildRequires:  python-setuptools
 %if %{with_html}
 BuildRequires:  python-numpydoc
 BuildRequires:  python-scikit-image
 %endif
 %if %{run_tests}
 BuildRequires:  python-nose
 %if %{with_python3}
 BuildRequires:  python3-nose
 %endif
 %endif
 BuildRequires:  python2-devel
 BuildRequires:  pytz
 BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  zlib-devel
@@ -93,61 +102,22 @@ errorcharts, scatterplots, etc, with just a few lines of code.
 %package -n python2-matplotlib
 Summary:        Python 2D plotting library
-BuildRequires:  python2-numpy
+%{?python_provide:%python_provide python2-matplotlib}
 BuildRequires:  python2-pyparsing
 BuildRequires:  python2-dateutil
 BuildRequires:  python2-kiwisolver
 BuildRequires:  python2-pyside
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-six
 BuildRequires:  python2-sphinx
 BuildRequires:  python2-subprocess32
 BuildRequires:  python2-devel
 BuildRequires:  python2-backports-functools_lru_cache
 BuildRequires:  python2-pillow
 BuildRequires:  python2-pytz
 %if %{with_html}
 BuildRequires:  %{_bindir}/pdftops
 # circular dependency: python2-basemap requires matplotlib
 BuildRequires:  python2-basemap
 BuildRequires:  python2-ipython-sphinx
 BuildRequires:  python2-numpydoc
 BuildRequires:  python2-scikit-image
 BuildRequires:  python2-colorspacious
 BuildRequires:  python2-cycler >= 0.10.0
 %endif
 %if %{run_tests}
 BuildRequires:  python2-pytest
 BuildRequires:  python2-pytest-xdist
 BuildRequires:  python2-cycler >= 0.10.0
 BuildRequires:  python2-mock
 %endif
 Requires:       dejavu-sans-fonts
 Requires:       dvipng
-Requires:       python2-numpy
+Requires:       python-six
-Requires:       python2-pyparsing
+Requires:       numpy
-Requires:       python2-cycler >= 0.10.0
+Requires:       pyparsing
-Requires:       python2-dateutil
+Requires:       python-dateutil
-Requires:       python2-kiwisolver
+Requires:       pytz
-Requires:       python2-backports-functools_lru_cache
+%if 0%{?fedora} >= 18
 Requires:       python-matplotlib-data = %{version}-%{release}
 %{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}
 Recommends:     python2-pillow
 Requires:       python2-six
 Requires:       python2-subprocess32
 Requires:       python2-pytz
 %if !%{with_bundled_fonts}
 Requires:       stix-math-fonts
 %else
-Provides:       bundled(stix-math-fonts)
+Requires:       stix-fonts
 %endif
-%{?python_provide:%python_provide python2-matplotlib}
+Requires:       %{name}-data = %{version}-%{release}
 Provides:       bundled(agg) = 2.4
 Provides:       bundled(ttconv)
 Provides:       bundled(js-jquery1) = 1.11.3
 Provides:       bundled(js-jquery1-ui) = 1.11.4
 Provides:       bundled(texlive-helvetic)
 %{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}
 %description -n python2-matplotlib
 Matplotlib is a python 2D plotting library which produces publication
 quality figures in a variety of hardcopy formats and interactive
@@ -160,157 +130,153 @@ You can generate plots, histograms, power spectra, bar charts,
 errorcharts, scatterplots, etc, with just a few lines of code.
 %package -n python2-matplotlib-qt4
 %{?python_provide:%python_provide python2-matplotlib-qt4}
 Summary:        Qt4 backend for python-matplotlib
-BuildRequires:  PyQt4-devel
+Group:          Development/Libraries
 Requires:       python2-PyQt4
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python2-matplotlib-qt5
-%{?python_provide:%python_provide python2-matplotlib-qt4}
+BuildRequires:  PyQt4-devel
 Requires:       PyQt4
 %description -n python2-matplotlib-qt4
 %{summary}
 %if %{with_qt5}
 %package -n python2-matplotlib-qt5
 Summary:        Qt5 backend for python-matplotlib
 BuildRequires:  python2-qt5
 Requires:       python2-qt5
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python2-matplotlib-qt5}
 Summary:        Qt5 backend for python-matplotlib
 Group:          Development/Libraries
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  python-qt5
 Requires:       python-qt5
 %description -n python2-matplotlib-qt5
 %{summary}
 %endif # with_qt5
 %package -n python2-matplotlib-gtk
 %{?python_provide:%python_provide python2-matplotlib-gtk}
 Summary:        GTK backend for python-matplotlib
 Group:          Development/Libraries
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  gtk2-devel
 BuildRequires:  pycairo-devel
 BuildRequires:  pygtk2-devel
 BuildRequires:  pycairo-devel
 Requires:       pycairo
 Requires:       pygtk2
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python2-matplotlib-gtk}
 %description -n python2-matplotlib-gtk
 %{summary}
 %package -n python2-matplotlib-gtk3
 %{?python_provide:%python_provide python2-matplotlib-gtk3}
 Summary:        GTK3 backend for python-matplotlib
 Group:          Development/Libraries
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 # This should be converted to typelib(Gtk) when supported
 BuildRequires:  gtk3
 BuildRequires:  pygobject3-base
 Requires:       gtk3%{?_isa}
 Requires:       pygobject3-base%{?_isa}
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python2-matplotlib-gtk3}
 %description -n python2-matplotlib-gtk3
 %{summary}
 %package -n python2-matplotlib-tk
 %{?python_provide:%python_provide python2-matplotlib-tk}
 Summary:        Tk backend for python-matplotlib
 Group:          Development/Libraries
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  tcl-devel
 BuildRequires:  tkinter
 BuildRequires:  tk-devel
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       tkinter
 %{?python_provide:%python_provide python2-matplotlib-tk}
 %description -n python2-matplotlib-tk
 %{summary}
 %if %{with_wx}
 %package -n python2-matplotlib-wx
 Summary:        wxPython backend for python-matplotlib
 BuildRequires:  wxPython-devel
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python2-wxpython
 %{?python_provide:%python_provide python2-matplotlib-wx}
 Summary:        wxPython backend for python-matplotlib
 Group:          Development/Libraries
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  wxPython-devel
 Requires:       wxPython
 %description -n python2-matplotlib-wx
 %{summary}
-
+%endif # with_wx
 %package -n python2-matplotlib-test-data
 Summary:        Test data for python2-matplotlib
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python2-matplotlib-test-data}
 %description -n python2-matplotlib-test-data
 %{summary}
 %package -n python2-matplotlib-doc
 %{?python_provide:%python_provide python2-matplotlib-doc}
 Summary:        Documentation files for python-matplotlib
 Group:          Documentation
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 %if %{with_html}
-BuildRequires:  dvipng
+BuildRequires:  python-sphinx
 BuildRequires:  graphviz
 BuildRequires:  python2-sphinx
 BuildRequires:  tex(latex)
 BuildRequires:  tex-preview
 BuildRequires:  dvipng
 BuildRequires:  graphviz
 %endif
 Requires:       python2-matplotlib%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python2-matplotlib-doc}
 %description -n python2-matplotlib-doc
 %{summary}
 %package -n python-matplotlib-data
 %{?python_provide:%python_provide python-matplotlib-data}
 Summary:        Data used by python-matplotlib
 BuildArch:      noarch
 %if %{with_bundled_fonts}
 Requires:       python-matplotlib-data-fonts = %{version}-%{release}
 %endif
-%{?python_provide:%python_provide python-matplotlib-data}
+BuildArch:      noarch
 %description -n python-matplotlib-data
 %{summary}
 %if %{with_bundled_fonts}
 %package -n python-matplotlib-data-fonts
 Summary:        Fonts used by python-matplotlib
 BuildArch:      noarch
 Requires:       python-matplotlib-data = %{version}-%{release}
 %{?python_provide:%python_provide python-matplotlib-data-fonts}
 Summary:        Fonts used by python-matplotlib
 Requires:       python-matplotlib-data = %{version}-%{release}
 BuildArch:      noarch
 %description -n python-matplotlib-data-fonts
 %{summary}
 %endif
 %if %{with_python3}
 %package -n     python3-matplotlib
 %{?python_provide:%python_provide python3-matplotlib}
 Summary:        Python 2D plotting library
 Group:          Development/Libraries
 BuildRequires:  python3-cairo
 BuildRequires:  python3-cycler >= 0.10.0
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-gobject
 BuildRequires:  python3-kiwisolver
 BuildRequires:  python3-numpy
-BuildRequires:  python3-pillow
+BuildRequires:  python3-pycxx-devel
 BuildRequires:  python3-pyparsing
 BuildRequires:  python3-pytz
 BuildRequires:  python3-six
-BuildRequires:  python3-sphinx
+Requires:       python3-six
 Requires:       python3-numpy
 Requires:       python3-cairo
 Requires:       python3-pyparsing
 Requires:       python3-dateutil
 Requires:       python3-pytz
 Requires:       dejavu-sans-fonts
 Requires:       dvipng
-Requires:       python-matplotlib-data = %{version}-%{release}
+%if 0%{?fedora} >= 18
 Requires:       python3-cairo
 Requires:       python3-cycler >= 0.10.0
 Requires:       python3-dateutil
 Requires:       python3-kiwisolver
 Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
 %if %{run_tests}
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-xdist
 %endif
 Requires:       python3-numpy
 Recommends:     python3-pillow
 Requires:       python3-pyparsing
 Requires:       python3-pytz
 Requires:       python3-six
 %if !%{with_bundled_fonts}
 Requires:       stix-math-fonts
 %else
-Provides:       bundled(stix-math-fonts)
+Requires:       stix-fonts
 %endif
-%{?python_provide:%python_provide python3-matplotlib}
+Requires:       %{name}-data = %{version}-%{release}
 Requires: python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
 %description -n python3-matplotlib
 Matplotlib is a python 2D plotting library which produces publication
@@ -324,79 +290,59 @@ You can generate plots, histograms, power spectra, bar charts,
 errorcharts, scatterplots, etc, with just a few lines of code.
 %package -n     python3-matplotlib-qt4
 %{?python_provide:%python_provide python3-matplotlib-qt4}
 Summary:        Qt4 backend for python3-matplotlib
-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}
 %if %{with_qt5}
 %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}
 Summary:        Qt5 backend for python3-matplotlib
 Group:          Development/Libraries
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  python3-qt5
 Requires:       python3-qt5
 %description -n python3-matplotlib-qt5
 %{summary}
 %endif # with_qt5
 # gtk2 never worked in Python 3 afaict, so no need for -gtk subpackage
 %package -n     python3-matplotlib-gtk3
 %{?python_provide:%python_provide python3-matplotlib-gtk3}
 Summary:        GTK3 backend for python3-matplotlib
 Group:          Development/Libraries
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 # This should be converted to typelib(Gtk) when supported
 BuildRequires:  gtk3
 BuildRequires:  python3-gobject
 Requires:       gtk3%{?_isa}
 Requires:       python3-gobject%{?_isa}
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python3-matplotlib-gtk3}
 %description -n python3-matplotlib-gtk3
 %{summary}
 %package -n     python3-matplotlib-tk
 Summary:        Tk backend for python3-matplotlib
 BuildRequires:  python3-tkinter
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 Requires:       python3-tkinter
 %{?python_provide:%python_provide python3-matplotlib-tk}
 Summary:        Tk backend for python3-matplotlib
 Group:          Development/Libraries
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 BuildRequires:  python3-tkinter
 Requires:       python3-tkinter
 %description -n python3-matplotlib-tk
 %{summary}
-
+%endif
 %package -n python3-matplotlib-test-data
 Summary:        Test data for python3-matplotlib
 Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python3-matplotlib-test-data}
 %description -n python3-matplotlib-test-data
 %{summary}
 %prep
-%autosetup -n matplotlib-%{version}%{?rctag} -N
+%setup -q -n matplotlib-%{version}
 %patch0001 -p1
 %patch0002 -p1
 # Fedora-specific patches follow:
 %patch1001 -p1
 # Updated test images for new FreeType.
 gzip -dc %SOURCE1000 | tar xvf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~'
 %ifnarch x86_64
 %patch1002 -p1
 %endif
 %ifarch aarch64 ppc64 ppc64le s390x
 %patch1004 -p1
 %endif
 %ifarch i686 armv7hl
 %patch1003 -p1
 %endif
 rm -r extern/libqhull
 # Copy setup.cfg to the builddir
 sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}
@@ -406,7 +352,7 @@ sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}
 # if updated from a version enabling fontconfig to one not
 # enabling it, or vice versa
 if [ %{version} = 1.4.3 ]; then
-    sed -i 's/\(__version__ = 200\)/\1.1/' lib/matplotlib/font_manager.py
+    sed -i 's/\(__version__ = 101\)/\1.1/' lib/matplotlib/font_manager.py
 fi
 %if !%{with_bundled_fonts}
@@ -414,9 +360,18 @@ fi
 sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py
 %endif
 # Remove references to bundled libraries
 %patch0 -b .noagg
 %patch1 -b .cxx
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 %build
 export http_proxy=http://127.0.0.1/
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
  xvfb-run %{__python2} setup.py build
@@ -433,17 +388,18 @@ popd
 # package doesn't drag in dependencies
 find examples -name '*.py' -exec chmod a-x '{}' \;
 %if %{with_python3}
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
  xvfb-run %{__python3} setup.py build
 # documentation cannot be built with python3 due to syntax errors
-# https://github.com/matplotlib/matplotlib/issues/5805
+# and building with python 2 exits with cryptic error messages
 %endif
 %install
 export http_proxy=http://127.0.0.1/
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
-  %{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
+  %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 chmod +x %{buildroot}%{python2_sitearch}/matplotlib/dates.py
 mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
 mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data/matplotlibrc \
@@ -454,84 +410,41 @@ mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data \
 rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
 %endif
-MPLCONFIGDIR=$PWD \
+%if %{with_python3}
-MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
+MPLCONFIGDIR=$PWD/.. \
 MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data/ \
    %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
 chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py
 rm -fr %{buildroot}%{python3_sitearch}/matplotlib/mpl-data
 rm -f %{buildroot}%{python3_sitearch}/six.py
 %endif
 %if %{run_tests}
 %check
 # These files confuse pytest, and we want to test the installed copy.
 rm -rf build*/
 export http_proxy=http://127.0.0.1/
 # This should match the default backend
 echo "backend      : %{backend}" > matplotlibrc
 # Full tests are not run because pytest doesn't seem to understand namespace
 # packages in PYTHONPATH.
 # Skips:
 #  * test_parasite: imports mpl_toolkits which is broken as noted above.
 #  * test_polycollection_close: imports mpl_toolkits which is broken as noted
 #    above.
 #  * test_invisible_Line_rendering: Checks for "slowness" that often fails on a
 #    heavily-loaded builder.
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python2_sitearch} \
-PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run %{__python} -c "import matplotlib; matplotlib.test()"
     xvfb-run -a -s "-screen 0 640x480x24" \
         %{__python2} -m pytest --pyargs matplotlib -ra -n $(getconf _NPROCESSORS_ONLN) \
             -m 'not network' \
             -k 'not test_invisible_Line_rendering and not test_parasite and not test_polycollection_close and not test_nose_image_comparison'
 %if %{with_python3}
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
-PYTHONDONTWRITEBYTECODE=1 \
+     xvfb-run %{__python3} -c "import matplotlib; matplotlib.test()"
-     xvfb-run -a -s "-screen 0 640x480x24" \
+%endif
         %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
             -m 'not network' \
             -k 'not test_invisible_Line_rendering and not test_nose_image_comparison'
 # We run these separately because they have issues when run in parallel.
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python2_sitearch} \
 PYTHONDONTWRITEBYTECODE=1 \
     xvfb-run -a -s "-screen 0 640x480x24" \
         %{__python2} -m pytest --pyargs matplotlib -ra \
             -k 'test_nose_image_comparison'
 MPLCONFIGDIR=$PWD \
 MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
 PYTHONDONTWRITEBYTECODE=1 \
     xvfb-run -a -s "-screen 0 640x480x24" \
         %{__python3} tests.py -ra \
             -k 'test_nose_image_comparison'
 %endif # run_tests
 %files -n python-matplotlib-data
 %{_sysconfdir}/matplotlibrc
 %{_datadir}/matplotlib/mpl-data/
 %if %{with_bundled_fonts}
 %exclude %{_datadir}/matplotlib/mpl-data/fonts/
 %endif
 %if %{with_bundled_fonts}
 %files -n python-matplotlib-data-fonts
 %{_datadir}/matplotlib/mpl-data/fonts/
 %endif
 %files -n python2-matplotlib
 %license LICENSE/
 %doc README.rst
 %doc CHANGELOG
 %doc PKG-INFO
 %{python2_sitearch}/*egg-info
 %{python2_sitearch}/matplotlib-*-nspkg.pth
 %{python2_sitearch}/matplotlib/
 %exclude %{python2_sitearch}/matplotlib/tests/baseline_images/*
 %{python2_sitearch}/mpl_toolkits/
 %exclude %{python2_sitearch}/mpl_toolkits/tests/baseline_images/*
 %{python2_sitearch}/pylab.py*
 %exclude %{python2_sitearch}/matplotlib/backends/backend_qt4*
 %exclude %{python2_sitearch}/matplotlib/backends/backend_qt5*
@@ -542,20 +455,17 @@ PYTHONDONTWRITEBYTECODE=1 \
 %exclude %{python2_sitearch}/matplotlib/backends/_tkagg.so
 %exclude %{python2_sitearch}/matplotlib/backends/backend_wx.*
 %exclude %{python2_sitearch}/matplotlib/backends/backend_wxagg.*
-%exclude %{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/*/
 %exclude %{_pkgdocdir}/*/*
 %files -n python2-matplotlib-test-data
 %{python2_sitearch}/matplotlib/tests/baseline_images/
 %{python2_sitearch}/mpl_toolkits/tests/baseline_images/
 %files -n python2-matplotlib-qt4
 %{python2_sitearch}/matplotlib/backends/backend_qt4.*
 %{python2_sitearch}/matplotlib/backends/backend_qt4agg.*
 %if %{with_qt5}
 %files -n python2-matplotlib-qt5
 %{python2_sitearch}/matplotlib/backends/backend_qt5.*
 %{python2_sitearch}/matplotlib/backends/backend_qt5agg.*
 %endif # with_qt5
 %files -n python2-matplotlib-gtk
 %{python2_sitearch}/matplotlib/backends/backend_gtk.py*
@@ -571,9 +481,11 @@ PYTHONDONTWRITEBYTECODE=1 \
 %{python2_sitearch}/matplotlib/backends/tkagg.py*
 %{python2_sitearch}/matplotlib/backends/_tkagg.so
 %if %{with_wx}
 %files -n python2-matplotlib-wx
 %{python2_sitearch}/matplotlib/backends/backend_wx.*
 %{python2_sitearch}/matplotlib/backends/backend_wxagg.*
 %endif # with_wx
 %files -n python2-matplotlib-doc
 %doc examples
@@ -581,15 +493,28 @@ PYTHONDONTWRITEBYTECODE=1 \
 %doc doc/build/html/*
 %endif
 %files -n python-matplotlib-data
 %{_sysconfdir}/matplotlibrc
 %{_datadir}/matplotlib/mpl-data/
 %if %{with_bundled_fonts}
 %exclude %{_datadir}/matplotlib/mpl-data/fonts/
 %endif
 %if %{with_bundled_fonts}
 %files -n python-matplotlib-data-fonts
 %{_datadir}/matplotlib/mpl-data/fonts/
 %endif
 %if %{with_python3}
 %files -n python3-matplotlib
 %license LICENSE/
 %doc README.rst
 %doc CHANGELOG
 %doc PKG-INFO
 %{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*
@@ -605,21 +530,19 @@ PYTHONDONTWRITEBYTECODE=1 \
 %exclude %{python3_sitearch}/matplotlib/backends/_tkagg.*
 %exclude %{_pkgdocdir}/*/
 %files -n python3-matplotlib-test-data
 %{python3_sitearch}/matplotlib/tests/baseline_images/
 %{python3_sitearch}/mpl_toolkits/tests/baseline_images/
 %files -n python3-matplotlib-qt4
 %{python3_sitearch}/matplotlib/backends/backend_qt4.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
 %{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
 %if %{with_qt5}
 %files -n python3-matplotlib-qt5
 %{python3_sitearch}/matplotlib/backends/backend_qt5.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*
 %{python3_sitearch}/matplotlib/backends/backend_qt5agg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*
 %endif # with_qt5
 %files -n python3-matplotlib-gtk3
 %{python3_sitearch}/matplotlib/backends/backend_gtk*
@@ -631,141 +554,11 @@ PYTHONDONTWRITEBYTECODE=1 \
 %{python3_sitearch}/matplotlib/backends/tkagg.*
 %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
 %{python3_sitearch}/matplotlib/backends/_tkagg.*
-
+%endif
 %changelog
-* Mon Aug 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.2.3-1
+* Mon Apr 18 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-14
 - 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)
@@ -959,7 +752,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)
@@ -1017,20 +810,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
+- New upstream release  
- Remove undistributable file from bundled agg library
+- 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
@@ -1091,7 +884,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
@@ -1153,7 +946,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,7 +1,2 @@
 [packages]
 tests = True
 toolkits = True
 toolkits_tests = True
 [rc_options]
 backend = GTKAgg
--- a/4
+++ b/4
@@ -1,3 +1 @@
-SHA512 (matplotlib-2.2.4.tar.gz) = c4ceb75314c303d310410683180dbe950223c7f054fc19739c49eaede46f183075ea402e7305843552fae75af3c55560f9e5c5549994cf5fce34f07ad6f3c720
+c16111ce7d6c799a2b557699f40eb709  matplotlib-1.4.3-without-extern.tar.xz
 SHA512 (matplotlib-2.2.3-with-freetype-2.9.1.tar.gz) = 00f6d4eeab6d73108129a5ccbaccda37c2e8cc684efeeb03c492a96a2071357a32a624ebfef2770c8c205a3741ef8d947f117351d90d25c4c7b4b8b6b84db556
 SHA512 (matplotlib-2.2.3-with-freetype-2.8.tar.gz) = 7f11a0589f2ab5fcbdee0da0d4fa003c62b9e882fbae22a6bc725f791f3ea058b33321a70a5cf1858f494aa1ebb8b3e686c56ff73e6174fb980e159331bd0a0d
Author	SHA1	Message	Date
Thomas Spura	697ce0c1f3	Add missing requires of dvipng to python3-matplotlib (#1270202 )	2016-04-18 09:27:28 +02:00
Thomas Spura	53aef6c52e	Remove spurious Provides: bundled(agg)	2016-04-04 13:28:22 +02:00