The package rpms/python2-matplotlib.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python2-matplotlib.git/commit/?id=62....
Change: +%ifarch i686 armv7hl
Thanks.
Full change: ============
commit 85a99d89be4f3081591d05d1c3d06dc3cf445182 Author: Mattias Ellert mattias.ellert@physics.uu.se Date: Fri Oct 26 07:54:17 2018 +0200
Rebuild after unretirement
diff --git a/python2-matplotlib.spec b/python2-matplotlib.spec index 3aa8ebe..07b8f54 100644 --- a/python2-matplotlib.spec +++ b/python2-matplotlib.spec @@ -41,7 +41,7 @@
Name: python2-matplotlib Version: 2.2.3 -Release: 2%{?rctag:.%{rctag}}%{?dist} +Release: 3%{?rctag:.%{rctag}}%{?dist} Summary: Python 2D plotting library # qt4_editor backend is MIT License: Python and MIT @@ -434,6 +434,9 @@ PYTHONDONTWRITEBYTECODE=1 \
%changelog +* Fri Oct 26 2018 Mattias Ellert mattias.ellert@physics.uu.se - 2.2.3-3 +- Rebuild after unretirement + * Wed Sep 19 2018 Miro Hronok mhroncok@redhat.com - 2.2.3-2 - Split python2-matplotlib from python-matplotlib
commit 62d04f9f83e0b90017569008999f44038ea6ee1e Author: Mattias Ellert mattias.ellert@physics.uu.se Date: Fri Oct 26 06:49:30 2018 +0200
Unretire package
Revert "Undo the mess that was checked in."
This reverts commit 61325fb06712da5fca46a1577bd39b083312c09c.
diff --git a/0001-Force-using-system-qhull.patch b/0001-Force-using-system-qhull.patch new file mode 100644 index 0000000..d8079bc --- /dev/null +++ b/0001-Force-using-system-qhull.patch @@ -0,0 +1,43 @@ +From 46361ca058295e3f08d3c54196d990c497834306 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade quantum.analyst@gmail.com +Date: Fri, 30 Mar 2018 03:15:51 -0400 +Subject: [PATCH] Force using system qhull. + +Signed-off-by: Elliott Sales de Andrade quantum.analyst@gmail.com +--- + setupext.py | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +diff --git a/setupext.py b/setupext.py +index d2ff239ad..30e0c9085 100644 +--- a/setupext.py ++++ b/setupext.py +@@ -1318,23 +1318,10 @@ class Qhull(SetupPackage): + + def check(self): + self.__class__.found_external = True +- try: +- return self._check_for_pkg_config( +- 'libqhull', 'libqhull/qhull_a.h', min_version='2015.2') +- except CheckFailed as e: +- self.__class__.found_pkgconfig = False +- self.__class__.found_external = False +- return str(e) + ' Using local copy.' ++ return ' Using system copy.' + + def add_flags(self, ext): +- if self.found_external: +- pkg_config.setup_extension(ext, 'qhull', +- default_libraries=['qhull']) +- else: +- ext.include_dirs.insert(0, 'extern') +- ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c'))) +- if sysconfig.get_config_var('LIBM') == '-lm': +- ext.libraries.extend('m') ++ ext.libraries.append('qhull') + + + class TTConv(SetupPackage): +-- +2.14.3 + diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch new file mode 100644 index 0000000..7c85c5d --- /dev/null +++ b/0001-matplotlibrc-path-search-fix.patch @@ -0,0 +1,97 @@ +From e318adb6b70cdb27eb8cd5235909b8e8430080d7 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/python2-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/python2-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/python2-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/python2-matplotlibrc') ++ else: ++ # ... on installed systems. ++ return '/etc/python2-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.17.1 + diff --git a/0002-Increase-tolerances-for-non-x86_64-arches.patch b/0002-Increase-tolerances-for-non-x86_64-arches.patch new file mode 100644 index 0000000..17d7262 --- /dev/null +++ b/0002-Increase-tolerances-for-non-x86_64-arches.patch @@ -0,0 +1,27 @@ +From ece1f936ba4c130cf82d3954a5e677d96ca3a854 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.17.1 + diff --git a/0003-Increase-some-tolerances-for-32-bit-systems.patch b/0003-Increase-some-tolerances-for-32-bit-systems.patch new file mode 100644 index 0000000..5b767d7 --- /dev/null +++ b/0003-Increase-some-tolerances-for-32-bit-systems.patch @@ -0,0 +1,567 @@ +From b8a97810843ff739cb98cb5159843f2836dbd8b3 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 0ce6e6252..9a80eec1a 100644 +--- a/lib/matplotlib/testing/decorators.py ++++ b/lib/matplotlib/testing/decorators.py +@@ -408,7 +408,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 2fa6c2c94..8c589f514 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)) +@@ -3947,7 +3946,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 +@@ -4806,7 +4805,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 = { +@@ -5301,7 +5300,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 e6da25789..ed3ab63c9 100644 +--- a/lib/matplotlib/tests/test_image.py ++++ b/lib/matplotlib/tests/test_image.py +@@ -768,7 +768,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 cdc1093e1..ac0d8bf05 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 0a506db92..44e1681fc 100644 +--- a/lib/mpl_toolkits/tests/test_mplot3d.py ++++ b/lib/mpl_toolkits/tests/test_mplot3d.py +@@ -225,7 +225,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 +@@ -704,7 +704,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.17.1 + diff --git a/0003-Increase-some-tolerances-for-non-x86-arches.patch b/0003-Increase-some-tolerances-for-non-x86-arches.patch new file mode 100644 index 0000000..e30ab11 --- /dev/null +++ b/0003-Increase-some-tolerances-for-non-x86-arches.patch @@ -0,0 +1,278 @@ +From 3e2bfee4e8ce28fffa7e9cd0a054429af2e2ebe3 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 2fa6c2c94..f785e3e89 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 +@@ -3267,7 +3267,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)) + +@@ -5000,7 +5001,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 df7a5d08a..3567d7f3d 100644 +--- a/lib/matplotlib/tests/test_backends_interactive.py ++++ b/lib/matplotlib/tests/test_backends_interactive.py +@@ -55,4 +55,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 e6da25789..626e9eb94 100644 +--- a/lib/matplotlib/tests/test_image.py ++++ b/lib/matplotlib/tests/test_image.py +@@ -768,7 +768,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.17.1 + diff --git a/dead.package b/dead.package deleted file mode 100644 index 4f04ecb..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -This is an EPEL-only package. diff --git a/python2-matplotlib.spec b/python2-matplotlib.spec new file mode 100644 index 0000000..3aa8ebe --- /dev/null +++ b/python2-matplotlib.spec @@ -0,0 +1,987 @@ +%global with_html 0 + +# It seems like there's some kind of weird occasional error where a +# build (often aarch64 or ppc64) will fail in one of the Stix font +# tests with a huge RMS difference, but if you run the same build again, +# you won't get the same error. Unless someone can figure out what's +# going on, we just have to keep re-running the build until it doesn't +# happen. +%global run_tests 1 + +# the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo +# CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG +%global backend TkAgg + +%if "%{backend}" == "TkAgg" +%global backend_subpackage tk +%else +% if "%{backend}" == "Qt4Agg" +%global backend_subpackage qt4 +% else +% if "%{backend}" == "Qt5Agg" +%global backend_subpackage qt5 +% endif +% endif +%endif + +# https://fedorahosted.org/fpc/ticket/381 +%global with_bundled_fonts 1 + +# Use the same directory of the main package for subpackage licence and docs +%global _docdir_fmt %{name} + +#global rctag rc1 + +# The version of FreeType in this Fedora branch. +%if %{fedora} >= 29 +%global ftver 2.9.1 +%else +%global ftver 2.8 +%endif + +Name: python2-matplotlib +Version: 2.2.3 +Release: 2%{?rctag:.%{rctag}}%{?dist} +Summary: Python 2D plotting library +# qt4_editor backend is MIT +License: Python and MIT +URL: http://matplotlib.org +Source0: https://github.com/matplotlib/matplotlib/archive/v%%7Bversion%7D%%7B?rctag%7... +Source1: setup.cfg + +# Because the qhull package stopped shipping pkgconfig files. +# https://src.fedoraproject.org/rpms/qhull/pull-request/1 +Patch0001: 0001-Force-using-system-qhull.patch + +# 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%%7Bversion%7D-with-freetype-... +# Search in /etc/python2-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: freetype-devel +BuildRequires: libpng-devel +BuildRequires: qhull-devel +BuildRequires: texlive-cm +BuildRequires: xorg-x11-server-Xvfb +BuildRequires: zlib-devel + +BuildRequires: python2-numpy +BuildRequires: python2-pyparsing +BuildRequires: python2-dateutil +BuildRequires: python2-kiwisolver +BuildRequires: python2-pyside +BuildRequires: python2-setuptools +BuildRequires: python2-six +BuildRequires: python2-sphinx +BuildRequires: python2-subprocess32 +BuildRequires: python2-devel +BuildRequires: python2-backports-functools_lru_cache +BuildRequires: python2-pillow +BuildRequires: python2-pytz +%if %{with_html} +BuildRequires: %{_bindir}/pdftops +# circular dependency: python2-basemap requires matplotlib +BuildRequires: python2-basemap +BuildRequires: python2-ipython-sphinx +BuildRequires: python2-numpydoc +BuildRequires: python2-scikit-image +BuildRequires: python2-colorspacious +BuildRequires: python2-cycler >= 0.10.0 +%endif +%if %{run_tests} +BuildRequires: python2-pytest +BuildRequires: python2-pytest-xdist +BuildRequires: python2-cycler >= 0.10.0 +BuildRequires: python2-mock +%endif +Requires: dejavu-sans-fonts +Requires: dvipng +Requires: python2-numpy +Requires: python2-pyparsing +Requires: python2-cycler >= 0.10.0 +Requires: python2-dateutil +Requires: python2-kiwisolver +Requires: python2-backports-functools_lru_cache +Requires: python2-matplotlib-data = %{version}-%{release} +%{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}} +Recommends: python2-pillow +Requires: python2-six +Requires: python2-subprocess32 +Requires: python2-pytz +%if !%{with_bundled_fonts} +Requires: stix-math-fonts +%else +Provides: bundled(stix-math-fonts) +%endif +%{?python_provide:%python_provide python2-matplotlib} +Provides: bundled(agg) = 2.4 +Provides: bundled(ttconv) +Provides: bundled(js-jquery1) = 1.11.3 +Provides: bundled(js-jquery1-ui) = 1.11.4 +Provides: bundled(texlive-helvetic) + +%description +Matplotlib is a python 2D plotting library which produces publication +quality figures in a variety of hardcopy formats and interactive +environments across platforms. matplotlib can be used in python +scripts, the python and ipython shell, web application servers, and +six graphical user interface toolkits. + +Matplotlib tries to make easy things easy and hard things possible. +You can generate plots, histograms, power spectra, bar charts, +errorcharts, scatterplots, etc, with just a few lines of code. + + +%package -n python2-matplotlib-qt4 +Summary: Qt4 backend for python2-matplotlib +BuildRequires: PyQt4-devel +Requires: python2-PyQt4 +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +Requires: python2-matplotlib-qt5 +%{?python_provide:%python_provide python2-matplotlib-qt4} + +%description -n python2-matplotlib-qt4 +%{summary} + +%package -n python2-matplotlib-qt5 +Summary: Qt5 backend for python2-matplotlib +BuildRequires: python2-qt5 +Requires: python2-qt5 +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python2-matplotlib-qt5} + +%description -n python2-matplotlib-qt5 +%{summary} + +%package -n python2-matplotlib-gtk +Summary: GTK backend for python2-matplotlib +BuildRequires: gtk2-devel +BuildRequires: pycairo-devel +BuildRequires: pygtk2-devel +Requires: pycairo +Requires: pygtk2 +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python2-matplotlib-gtk} + +%description -n python2-matplotlib-gtk +%{summary} + +%package -n python2-matplotlib-gtk3 +Summary: GTK3 backend for python2-matplotlib +# This should be converted to typelib(Gtk) when supported +BuildRequires: gtk3 +BuildRequires: pygobject3-base +Requires: gtk3%{?_isa} +Requires: pygobject3-base%{?_isa} +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python2-matplotlib-gtk3} + +%description -n python2-matplotlib-gtk3 +%{summary} + +%package -n python2-matplotlib-tk +Summary: Tk backend for python2-matplotlib +BuildRequires: tcl-devel +BuildRequires: tkinter +BuildRequires: tk-devel +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +Requires: tkinter +%{?python_provide:%python_provide python2-matplotlib-tk} + +%description -n python2-matplotlib-tk +%{summary} + +%package -n python2-matplotlib-wx +Summary: wxPython backend for python2-matplotlib +BuildRequires: wxPython-devel +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +Requires: python2-wxpython +%{?python_provide:%python_provide python2-matplotlib-wx} + +%description -n python2-matplotlib-wx +%{summary} + +%package -n python2-matplotlib-test-data +Summary: Test data for python2-matplotlib +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python2-matplotlib-test-data} + +%description -n python2-matplotlib-test-data +%{summary} + +%package -n python2-matplotlib-doc +Summary: Documentation files for python2-matplotlib +%if %{with_html} +BuildRequires: dvipng +BuildRequires: graphviz +BuildRequires: python2-sphinx +BuildRequires: tex(latex) +BuildRequires: tex-preview +%endif +Requires: python2-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python2-matplotlib-doc} + +%description -n python2-matplotlib-doc +%{summary} + +%package -n python2-matplotlib-data +Summary: Data used by python2-matplotlib +BuildArch: noarch +%if %{with_bundled_fonts} +Requires: python2-matplotlib-data-fonts = %{version}-%{release} +%endif +%{?python_provide:%python_provide python2-matplotlib-data} + +%description -n python2-matplotlib-data +%{summary} + +%if %{with_bundled_fonts} +%package -n python2-matplotlib-data-fonts +Summary: Fonts used by python2-matplotlib +# STIX and Computer Modern is OFL +# DejaVu is Bitstream Vera and Public Domain +License: OFL and Bitstream Vera and Public Domain +BuildArch: noarch +Requires: python2-matplotlib-data = %{version}-%{release} +%{?python_provide:%python_provide python2-matplotlib-data-fonts} + +%description -n python2-matplotlib-data-fonts +%{summary} +%endif + +%prep +%autosetup -n matplotlib-%{version}%{?rctag} -N +%patch0001 -p1 + +# Fedora-specific patches follow: +%patch1001 -p1 +# Updated test images for new FreeType. +gzip -dc %SOURCE1000 | tar xvf - --transform='s~^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} + +# Keep this until next version, and increment if changing from +# USE_FONTCONFIG to False or True so that cache is regenerated +# if updated from a version enabling fontconfig to one not +# enabling it, or vice versa +if [ %{version} = 1.4.3 ]; then + sed -i 's/(__version__ = 200)/\1.1/' lib/matplotlib/font_manager.py +fi + +%if !%{with_bundled_fonts} +# Use fontconfig by default +sed -i 's/(USE_FONTCONFIG = )False/\1True/' lib/matplotlib/font_manager.py +%endif + + +%build +export http_proxy=http://127.0.0.1/ +MPLCONFIGDIR=$PWD \ +MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \ + xvfb-run -a %{__python2} setup.py build +%if %{with_html} +# Need to make built matplotlib libs available for the sphinx extensions: +pushd doc + MPLCONFIGDIR=$PWD/.. \ + MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data \ + PYTHONPATH=`realpath ../build/lib.linux*` \ + %{__python2} make.py html +popd +%endif +# Ensure all example files are non-executable so that the -doc +# package doesn't drag in dependencies +find examples -name '*.py' -exec chmod a-x '{}' ; + +%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} +chmod +x %{buildroot}%{python2_sitearch}/matplotlib/dates.py +mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/python2-matplotlib +mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data/matplotlibrc \ + %{buildroot}%{_sysconfdir}/python2-matplotlibrc +mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data \ + %{buildroot}%{_datadir}/python2-matplotlib +%if !%{with_bundled_fonts} +rm -rf %{buildroot}%{_datadir}/python2-matplotlib/mpl-data/fonts +%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}/python2-matplotlib/mpl-data \ +PYTHONPATH=%{buildroot}%{python2_sitearch} \ +PYTHONDONTWRITEBYTECODE=1 \ + xvfb-run -a -s "-screen 0 640x480x24" \ + %{__python2} -m pytest --pyargs matplotlib -ra -n $(getconf _NPROCESSORS_ONLN) \ + -m 'not network' \ + -k 'not test_invisible_Line_rendering and not test_parasite and not test_polycollection_close and not test_nose_image_comparison' + +# We run these separately because they have issues when run in parallel. +MPLCONFIGDIR=$PWD \ +MATPLOTLIBDATA=%{buildroot}%{_datadir}/python2-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' +%endif # run_tests + +%files -n python2-matplotlib-data +%{_sysconfdir}/python2-matplotlibrc +%{_datadir}/python2-matplotlib/mpl-data/ +%if %{with_bundled_fonts} +%exclude %{_datadir}/python2-matplotlib/mpl-data/fonts/ +%endif + +%if %{with_bundled_fonts} +%files -n python2-matplotlib-data-fonts +%{_datadir}/python2-matplotlib/mpl-data/fonts/ +%endif + +%files -n python2-matplotlib +%license LICENSE/ +%doc README.rst +%{python2_sitearch}/*egg-info +%{python2_sitearch}/matplotlib-*-nspkg.pth +%{python2_sitearch}/matplotlib/ +%exclude %{python2_sitearch}/matplotlib/tests/baseline_images/* +%{python2_sitearch}/mpl_toolkits/ +%exclude %{python2_sitearch}/mpl_toolkits/tests/baseline_images/* +%{python2_sitearch}/pylab.py* +%exclude %{python2_sitearch}/matplotlib/backends/backend_qt4* +%exclude %{python2_sitearch}/matplotlib/backends/backend_qt5* +%exclude %{python2_sitearch}/matplotlib/backends/backend_gtk* +%exclude %{python2_sitearch}/matplotlib/backends/_gtkagg.* +%exclude %{python2_sitearch}/matplotlib/backends/backend_tkagg.* +%exclude %{python2_sitearch}/matplotlib/backends/tkagg.* +%exclude %{python2_sitearch}/matplotlib/backends/_tkagg.so +%exclude %{python2_sitearch}/matplotlib/backends/backend_wx.* +%exclude %{python2_sitearch}/matplotlib/backends/backend_wxagg.* +%exclude %{_pkgdocdir}/* +%exclude %{_pkgdocdir}/*/* + +%files -n python2-matplotlib-test-data +%{python2_sitearch}/matplotlib/tests/baseline_images/ +%{python2_sitearch}/mpl_toolkits/tests/baseline_images/ + +%files -n python2-matplotlib-qt4 +%{python2_sitearch}/matplotlib/backends/backend_qt4.* +%{python2_sitearch}/matplotlib/backends/backend_qt4agg.* + +%files -n python2-matplotlib-qt5 +%{python2_sitearch}/matplotlib/backends/backend_qt5.* +%{python2_sitearch}/matplotlib/backends/backend_qt5agg.* + +%files -n python2-matplotlib-gtk +%{python2_sitearch}/matplotlib/backends/backend_gtk.py* +%{python2_sitearch}/matplotlib/backends/backend_gtkagg.py* +%{python2_sitearch}/matplotlib/backends/backend_gtkcairo.py* +%{python2_sitearch}/matplotlib/backends/_gtkagg.so + +%files -n python2-matplotlib-gtk3 +%{python2_sitearch}/matplotlib/backends/backend_gtk3*.py* + +%files -n python2-matplotlib-tk +%{python2_sitearch}/matplotlib/backends/backend_tkagg.py* +%{python2_sitearch}/matplotlib/backends/tkagg.py* +%{python2_sitearch}/matplotlib/backends/_tkagg.so + +%files -n python2-matplotlib-wx +%{python2_sitearch}/matplotlib/backends/backend_wx.* +%{python2_sitearch}/matplotlib/backends/backend_wxagg.* + +%files -n python2-matplotlib-doc +%doc examples +%if %{with_html} +%doc doc/build/html/* +%endif + + +%changelog +* Wed Sep 19 2018 Miro Hronok mhroncok@redhat.com - 2.2.3-2 +- Split python2-matplotlib from python-matplotlib + +* Mon Aug 13 2018 Elliott Sales de Andrade quantum.analyst@gmail.com - 2.2.3-1 +- Update to latest version + +* Fri Jul 20 2018 Elliott Sales de Andrade quantum.analyst@gmail.com - 2.2.2-4 +- Don't use unversioned Python in build (#1605766) +- Add missing texlive-cm BR + +* Sat Jul 14 2018 Fedora Release Engineering releng@fedoraproject.org - 2.2.2-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hronok 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 Hork <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 Hork <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_Pac... + +* 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 Corspius corsepiu@fedoraproject.org - 1.5.1-4 +- Rebuild for qhull-2015.2-1. +- Reflect qhull_a.h's location having changed. + +* Wed Apr 6 2016 Orion Poplawski orion@cora.nwra.com - 1.5.1-3 +- Add requires python-cycler + +* Tue Apr 05 2016 Jon Ciesla limburgher@gmail.com - 1.5.1-2 +- Drop agg-devel BR, fix sphinx build with python*cycler BR + +* Mon Apr 04 2016 Thomas Spura tomspur@fedoraproject.org - 1.5.1-1 +- update to 1.5.1 (#1276806) +- Add missing requires of dvipng to python3-matplotlib (#1270202) +- use bundled agg (#1276806) +- Drop cxx patch (was dropped upstream) +- Regenerate search path patch2 + +* Mon Apr 04 2016 Thomas Spura tomspur@fedoraproject.org - 1.4.3-13 +- Require the qt5 subpackage from the qt4 subpackage (#1219556) + +* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 1.4.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 12 2016 Thomas Spura tomspur@fedoraproject.org - 1.4.3-11 +- Fix another requires of the main package + +* Thu Jan 07 2016 Thomas Spura tomspur@fedoraproject.org - 1.4.3-10 +- Fix requiring the correct backend from the main package + +* Thu Jan 07 2016 Thomas Spura tomspur@fedoraproject.org - 1.4.3-9 +- regenerate tarball to exclude lena image (#1295174) + +* Sun Nov 15 2015 Thomas Spura tomspur@fedoraproject.org - 1.4.3-8 +- Pick upstream patch for fixing the gdk backend #1231748 +- Add python2 subpackages and use python_provide + +* Tue Nov 10 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.4.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Jun 18 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember kalevlember@gmail.com - 1.4.3-5 +- Rebuilt for GCC 5 C++11 ABI change + +* Wed Feb 25 2015 Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl - 1.4.3-4 +- Split out python-matplotlib-gtk, python-matplotlib-gtk3, + python3-matplotlib-gtk3 subpackages (#1067373) +- Add missing requirements on gtk + +* Tue Feb 24 2015 Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl - 1.4.3-3 +- Use %%license, add skimage to build requirements + +* Tue Feb 17 2015 Elliott Sales de Andrade quantum.analyst@gmail.com - 1.4.3-2 +- Disable Qt5 backend on Fedora <21 and RHEL + +* Tue Feb 17 2015 Elliott Sales de Andrade quantum.analyst@gmail.com - 1.4.3-1 +- New upstream release (#1134007) +- Add Qt5 backend + +* Tue Jan 13 2015 Elliott Sales de Andrade quantum.analyst@gmail.com - 1.4.2-1 +- Bump to new upstream release +- Add qhull-devel to BR +- Add six to Requires + +* Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jaroslav karvada jskarvad@redhat.com - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + +* Wed May 14 2014 Bohuslav Kabrda bkabrda@redhat.com - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Tue Feb 11 2014 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.3.1-3 +- Make TkAgg the default backend +- Remove python2 dependency from -data subpackage + +* Mon Jan 27 2014 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.3.1-2 +- Correct environment for and enable %%check +- Install system wide matplotlibrc under /etc +- Do not duplicate mpl-data for python2 and python3 packages +- Conditionally bundle data fonts (https://fedorahosted.org/fpc/ticket/381) + +* Sat Jan 25 2014 Thomas Spura tomspur@fedoraproject.org - 1.3.1-1 +- update to 1.3.1 +- use GTKAgg as backend (#1030396, #982793, #1049624) +- use fontconfig +- add %%check for local testing (testing requires a display) + +* Wed Aug 7 2013 Thomas Spura tomspur@fedoraproject.org - 1.3.0-1 +- update to new version +- use xz to compress sources +- drop fontconfig patch (upstream) +- drop tk patch (upstream solved build issue differently) +- redo use system agg patch +- delete bundled python-pycxx headers +- fix requires of python3-matplotlib-qt (fixes #988412) + +* Sun Aug 04 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.2.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jun 10 2013 Jon Ciesla limburgher@gmail.com - 1.2.0-14 +- agg rebuild. + +* Wed Apr 10 2013 Thomas Spura tomspur@fedoraproject.org - 1.2.0-13 +- use python3 version in python3-matplotlib-qt4 (#915727) +- include __pycache__ files in correct subpackages on python3 + +* Wed Apr 3 2013 Thomas Spura tomspur@fedoraproject.org - 1.2.0-12 +- Decode output of subprocess to utf-8 or regex will fail (#928326) + +* Tue Apr 2 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-11 +- Make stix-fonts a requires of matplotlib (#928326) + +* Thu Mar 28 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-10 +- Use stix fonts avoid problems with missing cm fonts (#908717) +- Correct type mismatch in python3 font_manager (#912843, #928326) + +* Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jan 16 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-8 +- Update fontconfig patch to apply issue found by upstream +- Update fontconfig patch to apply issue with missing afm fonts (#896182) + +* Wed Jan 16 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-7 +- Use fontconfig by default (#885307) + +* Thu Jan 3 2013 David Malcolm dmalcolm@redhat.com - 1.2.0-6 +- remove wx support for rhel >= 7 + +* Tue Dec 04 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-5 +- Reinstantiate wx backend for python2.x. +- Run setup.py under xvfb-run to detect and default to gtk backend (#883502) +- Split qt4 backend subpackage and add proper requires for it. +- Correct wrong regex in tcl libdir patch. + +* Tue Nov 27 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-4 +- Obsolete python-matplotlib-wx for clean updates. + +* Tue Nov 27 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-3 +- Enable python 3 in fc18 as build requires are now available (#879731) + +* Thu Nov 22 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-2 +- Build python3 only on f19 or newer (#837156) +- Build requires python3-six if building python3 support (#837156) + +* Thu Nov 22 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.2.0-1 +- Update to version 1.2.0 +- Revert to regenerate tarball with generate-tarball.sh (#837156) +- Assume update to 1.2.0 is for recent releases +- Remove %%defattr +- Remove %%clean +- Use simpler approach to build html documentation +- Do not use custom/outdated setup.cfg +- Put one BuildRequires per line +- Enable python3 support +- Cleanup spec as wx backend is no longer supported +- Use default agg backend +- Fix bogus dates in changelog by assuming only week day was wrong + +* Fri Aug 17 2012 Jerry James loganjerry@gmail.com - 1.1.1-1 +- Update to version 1.1.1. +- Remove obsolete spec file elements +- Fix sourceforge URLs +- Allow sample data to have a different version number than the sources +- Don't bother removing problematic file since we remove entire agg24 directory +- Fix building with pygtk in the absence of an X server +- Don't install license text for bundled software that we don't bundle + +* Sat Jul 21 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 3 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 1.1.0-1 +- Update to version 1.1.0. +- Do not regenerate upstream tarball but remove problematic file in %%prep. +- Remove non longer applicable/required patch0. +- Rediff/rename -noagg patch. +- Remove propagate-timezone-info-in-plot_date-xaxis_da patch already applied. +- Remove tkinter patch now with critical code in a try block. +- Remove png 1.5 patch as upstream is now png 1.5 aware. +- Update file list. + +* Wed Apr 18 2012 David Malcolm dmalcolm@redhat.com - 1.0.1-20 +- remove wx support for rhel >= 7 + +* Tue Feb 28 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0.1-19 +- Rebuilt for c++ ABI breakage + +* Sat Jan 14 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 6 2011 David Malcolm dmalcolm@redhat.com - 1.0.1-17 +- fix the build against libpng 1.5 + +* Tue Dec 6 2011 David Malcolm dmalcolm@redhat.com - 1.0.1-16 +- fix egg-info conditional for RHEL + +* Tue Dec 06 2011 Adam Jackson ajax@redhat.com - 1.0.1-15 +- Rebuild for new libpng + +* Mon Oct 31 2011 Dan Hork <dan[at]danny.cz> - 1.0.1-14 +- 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) + +* Fri May 20 2011 Orion Poplawski orion@cora.nwra.com - 1.0.1-12 +- Add Requires dvipng (Bug 684836) +- Build against system agg (Bug 612807) +- Use system pyparsing (Bug 702160) + +* Sat Feb 26 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-11 +- Set PYTHONPATH during html doc building using find to prevent broken builds + +* Sat Feb 26 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-10 +- Spec file cleanups for readability + +* Sat Feb 26 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-9 +- Bump and rebuild + +* Sat Feb 26 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-8 +- Fix spec file typos so package builds + +* Fri Feb 25 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-7 +- Remove a debugging echo statement from the spec file +- Fix some line endings and permissions in -doc sub-package + +* Fri Feb 25 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-6 +- Spec file cleanups to silence some rpmlint warnings + +* Mon Feb 21 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-5 +- Add default attr to doc sub-package file list +- No longer designate -doc subpackage as noarch +- Add arch specific Requires for tk, wx and doc sub-packages + +* Mon Feb 21 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-4 +- Enable wxPython backend +- Make -doc sub-package noarch + +* Mon Feb 21 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-3 +- Add conditional for optionally building doc sub-package +- Add flag to build low res images for documentation +- Add matplotlib-1.0.1-plot_directive.patch to fix build of low res images +- Remove unused patches + +* Sat Feb 19 2011 Jonathan G. Underwood jonathan.underwood@gmail.com - 1.0.1-2 +- Build and package HTML documentation in -doc sub-package +- Move examples to -doc sub-package +- Make examples non-executable + +* Fri Feb 18 2011 Thomas Spura tomspur@fedoraproject.org - 1.0.1-1 +- update to new bugfix version (#678489) +- set file attributes in tk subpackage +- filter private *.so + +* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 22 2010 David Malcolm dmalcolm@redhat.com - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1 +- New upstream release +- Remove undistributable file from bundled agg library + +* Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1 +- 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. + +* Mon Apr 12 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-2 +- 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 + +* Fri Dec 11 2009 Jon Ciesla limb@jcomserv.net - 0.99.1.2 +- Update to 0.99.1.2 + +* Sun Jul 26 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0.98.5.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Mar 06 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-4 +- Fixed font dep after font guideline change + +* Thu Feb 26 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0.98.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 23 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-2 +- Add dep on DejaVu Sans font for default font support + +* Mon Dec 22 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-1 +- Latest upstream release +- Strip out included fonts + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams ivazqueznet+rpm@gmail.com - 0.98.3-2 +- Rebuild for Python 2.6 + +* Wed Aug 6 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.3-1 +- Latest upstream release + +* Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.1-1 +- Latest upstream release + +* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-2 +- gcc43 cleanups + +* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-1 +- New upstream version +- Adding Fedora specific setup.cfg from included template +- removed numarry and numerics build requirements + +* Tue Feb 19 2008 Fedora Release Engineering rel-eng@fedoraproject.org - 0.90.1-6 +- Autorebuild for GCC 4.3 + +* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-5 +- Fixed typo in spec. + +* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-4 +- Support for Python Eggs for F9+ + +* Thu Jan 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-3 +- Rebuild for new Tcl 8.5 + +* Thu Aug 23 2007 Orion Poplawski orion@cora.nwra.com 0.90.1-2 +- Update license tag to Python +- Rebuild for BuildID + +* Mon Jun 04 2007 Orion Poplawski orion@cora.nwra.com 0.90.1-1 +- Update to 0.90.1 + +* Wed Feb 14 2007 Orion Poplawski orion@cora.nwra.com 0.90.0-2 +- 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 + +* Fri Feb 09 2007 Orion Poplawski orion@cora.nwra.com 0.90.0-1 +- Update to 0.90.0 + +* Fri Jan 5 2007 Orion Poplawski orion@cora.nwra.com 0.87.7-4 +- Add examples to %%docs + +* Mon Dec 11 2006 Jef Spaleta jspaleta@gmail.com 0.87.7-3 +- Release bump for rebuild against python 2.5 in devel tree + +* Tue Dec 5 2006 Orion Poplawski orion@cora.nwra.com 0.87.7-2 +- Force build of gtk/gtkagg backends in mock (bug #218153) +- Change Requires from python-numeric to numpy (bug #218154) + +* Tue Nov 21 2006 Orion Poplawski orion@cora.nwra.com 0.87.7-1 +- Update to 0.87.7 and fix up the defaults to use numpy +- Force build of tkagg backend without X server +- Use src.rpm from Jef Spaleta, closes bug 216578 + +* Fri Oct 6 2006 Orion Poplawski orion@cora.nwra.com 0.87.6-1 +- Update to 0.87.6 + +* Thu Sep 7 2006 Orion Poplawski orion@cora.nwra.com 0.87.5-1 +- Update to 0.87.5 + +* Thu Jul 27 2006 Orion Poplawski orion@cora.nwra.com 0.87.4-1 +- Update to 0.87.4 + +* Wed Jun 7 2006 Orion Poplawski orion@cora.nwra.com 0.87.3-1 +- Update to 0.87.3 + +* Mon May 15 2006 Orion Poplawski orion@cora.nwra.com 0.87.2-2 +- Rebuild for new numpy + +* Tue Mar 7 2006 Orion Poplawski orion@cora.nwra.com 0.87.2-1 +- Update to 0.87.2 + +* Tue Mar 7 2006 Orion Poplawski orion@cora.nwra.com 0.87.1-1 +- Update to 0.87.1 +- Add pycairo >= 1.0.2 requires (FC5+ only) + +* Fri Feb 24 2006 Orion Poplawski orion@cora.nwra.com 0.87-1 +- Update to 0.87 +- Add BR numpy and python-numarray +- Add patch to keep Numeric as the default numerix package +- Add BR tkinter and tk-devel for TkInter backend +- Make separate package for Tk backend + +* Tue Jan 10 2006 Orion Poplawski orion@cora.nwra.com 0.86-1 +- Update to 0.86 + +* Thu Dec 22 2005 Orion Poplawski orion@cora.nwra.com 0.85-2 +- Rebuild + +* Sun Nov 20 2005 Orion Poplawski orion@cora.nwra.com 0.85-1 +- New upstream version 0.85 + +* Mon Sep 19 2005 Orion Poplawski orion@cora.nwra.com 0.84-1 +- New upstream version 0.84 + +* Tue Aug 02 2005 Orion Poplawski orion@cora.nwra.com 0.83.2-3 +- bump release + +* Tue Aug 02 2005 Orion Poplawski orion@cora.nwra.com 0.83.2-2 +- Add Requires: python-numeric, pytz, python-dateutil + +* Fri Jul 29 2005 Orion Poplawski orion@cora.nwra.com 0.83.2-1 +- New upstream version matplotlib 0.83.2 + +* Thu Jul 28 2005 Orion Poplawski orion@cora.nwra.com 0.83.1-2 +- Bump rel to fix botched tag + +* Thu Jul 28 2005 Orion Poplawski orion@cora.nwra.com 0.83.1-1 +- New upstream version matplotlib 0.83.1 + +* Tue Jul 05 2005 Orion Poplawski orion@cora.nwra.com 0.82-4 +- BuildRequires: pytz, python-dateutil - use upstream +- Don't use INSTALLED_FILES, list dirs +- Fix execute permissions + +* Fri Jul 01 2005 Orion Poplawski orion@cora.nwra.com 0.82-3 +- Use %%{python_sitearch} + +* Thu Jun 30 2005 Orion Poplawski orion@cora.nwra.com 0.82-2 +- Rename to python-matplotlib +- Remove unneeded Requires: python +- Add private directories to %%files + +* Tue Jun 28 2005 Orion Poplawski orion@cora.nwra.com 0.82-1 +- Initial package for Fedora Extras diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..978e5f4 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,7 @@ +[packages] +tests = True +toolkits = True +toolkits_tests = True + +[rc_options] +backend = GTKAgg diff --git a/sources b/sources new file mode 100644 index 0000000..53a771b --- /dev/null +++ b/sources @@ -0,0 +1,3 @@ +SHA512 (matplotlib-2.2.3.tar.gz) = d118f5d56e2f578031aba22933c0b3a4423a31a04f50f08cc1aa660186546d09692a9cf401bb5f24cb296f94fbfd8707460728d501ac2bd4a624dfa89e92949b +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
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org