From c385e2c1a9cad272f8379d181564a7210b33d2fb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 28 Aug 2018 23:29:22 -0400 Subject: [PATCH] Update to 3.0.0rc2. --- .gitignore | 2 + 0001-matplotlibrc-path-search-fix.patch | 4 +- ...ase-tolerances-for-non-x86_64-arches.patch | 20 ++- ...e-some-tolerances-for-32-bit-systems.patch | 122 ++++++++++++++++-- ...e-some-tolerances-for-non-x86-arches.patch | 2 +- python-matplotlib.spec | 4 +- sources | 4 +- 7 files changed, 136 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 5cf80af..086d915 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-2.2.3-with-freetype-2.9.1.tar.gz /matplotlib-3.0.0rc1.tar.gz /matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz +/matplotlib-3.0.0rc2.tar.gz +/matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 836687c..464bb46 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,4 +1,4 @@ -From cdfa3680a45c623d8c36b39c229190436c5a6c17 Mon Sep 17 00:00:00 2001 +From c9bf5a0f69ae4f7f73f60a17237b95452081ab79 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 Subject: [PATCH 1/3] matplotlibrc path search fix @@ -10,7 +10,7 @@ Signed-off-by: Elliott Sales de Andrade 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index 3f2a6a300..a2679c11c 100644 +index f7b37ee3b..508e1658d 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -664,18 +664,7 @@ def _get_data_path(): diff --git a/0002-Increase-tolerances-for-non-x86_64-arches.patch b/0002-Increase-tolerances-for-non-x86_64-arches.patch index 9824295..31e2cbc 100644 --- a/0002-Increase-tolerances-for-non-x86_64-arches.patch +++ b/0002-Increase-tolerances-for-non-x86_64-arches.patch @@ -1,12 +1,13 @@ -From 938c1fbca5e3cb1034731f3439c3d146c02f210d Mon Sep 17 00:00:00 2001 +From 2886eadf6aff7c8faca2ea0f1bb7d1966e9a77b9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade 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 --- - lib/matplotlib/tests/test_streamplot.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + lib/matplotlib/tests/test_streamplot.py | 2 +- + lib/mpl_toolkits/tests/test_axes_grid1.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py index 17c0d1967..e261513df 100644 @@ -21,6 +22,19 @@ index 17c0d1967..e261513df 100644 remove_text=True, style='mpl20') def test_masks_and_nans(): X, Y, U, V = velocity_field() +diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py +index 896ba503f..bd48bee72 100644 +--- a/lib/mpl_toolkits/tests/test_axes_grid1.py ++++ b/lib/mpl_toolkits/tests/test_axes_grid1.py +@@ -359,7 +359,7 @@ def test_zooming_with_inverted_axes(): + + + @image_comparison(baseline_images=['anchored_direction_arrows'], +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), ++ tol=0.02, + extensions=['png']) + def test_anchored_direction_arrows(): + fig, ax = plt.subplots() -- 2.17.1 diff --git a/0003-Increase-some-tolerances-for-32-bit-systems.patch b/0003-Increase-some-tolerances-for-32-bit-systems.patch index 7a4fb95..99ae5b5 100644 --- a/0003-Increase-some-tolerances-for-32-bit-systems.patch +++ b/0003-Increase-some-tolerances-for-32-bit-systems.patch @@ -1,4 +1,4 @@ -From 943a2ccfd21f7b94d1bdf9d665c123687c7cdfd2 Mon Sep 17 00:00:00 2001 +From c7eb73b3a73d2aaced7c63a314f0ef724fa4c416 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 31 Mar 2018 00:15:14 -0400 Subject: [PATCH 3/3] Increase some tolerances for 32-bit systems. @@ -7,12 +7,15 @@ Signed-off-by: Elliott Sales de Andrade --- lib/matplotlib/testing/decorators.py | 2 +- lib/matplotlib/tests/test_artist.py | 3 +- - lib/matplotlib/tests/test_axes.py | 46 ++++++++++--------- + lib/matplotlib/tests/test_axes.py | 49 ++++++++++--------- lib/matplotlib/tests/test_collections.py | 2 +- lib/matplotlib/tests/test_colorbar.py | 11 +++-- .../tests/test_constrainedlayout.py | 2 +- - lib/matplotlib/tests/test_contour.py | 8 ++-- + lib/matplotlib/tests/test_contour.py | 8 +-- + lib/matplotlib/tests/test_cycles.py | 3 -- + lib/matplotlib/tests/test_figure.py | 3 +- lib/matplotlib/tests/test_image.py | 2 +- + lib/matplotlib/tests/test_legend.py | 5 +- lib/matplotlib/tests/test_mathtext.py | 4 +- lib/matplotlib/tests/test_patches.py | 3 +- lib/matplotlib/tests/test_patheffects.py | 2 +- @@ -20,10 +23,11 @@ Signed-off-by: Elliott Sales de Andrade lib/matplotlib/tests/test_quiver.py | 2 +- lib/matplotlib/tests/test_streamplot.py | 2 +- lib/matplotlib/tests/test_transforms.py | 2 +- + lib/matplotlib/tests/test_units.py | 1 - .../tests/test_axisartist_floating_axes.py | 4 +- ...test_axisartist_grid_helper_curvelinear.py | 6 +-- lib/mpl_toolkits/tests/test_mplot3d.py | 4 +- - 18 files changed, 56 insertions(+), 51 deletions(-) + 22 files changed, 59 insertions(+), 63 deletions(-) diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py index 85b8d5e87..f3fc47c68 100644 @@ -53,7 +57,7 @@ index 283db9abe..2ae11142c 100644 exterior = mpath.Path.unit_rectangle().deepcopy() exterior.vertices *= 4 diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index a5b7331d3..03673d1d3 100644 +index a5b7331d3..2549ff16f 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -553,7 +553,7 @@ def test_single_point(): @@ -229,7 +233,17 @@ index a5b7331d3..03673d1d3 100644 def test_horiz_violinplot_custompoints_200(): ax = plt.axes() # First 9 digits of frac(sqrt(43)) -@@ -4031,7 +4033,7 @@ def test_psd_noise(): +@@ -3350,8 +3352,7 @@ def test_vertex_markers(): + + + @image_comparison(baseline_images=['vline_hline_zorder', +- 'errorbar_zorder'], +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) ++ 'errorbar_zorder']) + def test_eb_line_zorder(): + x = list(range(10)) + +@@ -4031,7 +4032,7 @@ def test_psd_noise(): @image_comparison(baseline_images=['csd_freqs'], remove_text=True, @@ -238,7 +252,7 @@ index a5b7331d3..03673d1d3 100644 def test_csd_freqs(): '''test axes.csd with sinusoidal stimuli''' n = 10000 -@@ -4924,7 +4926,7 @@ def test_rc_spines(): +@@ -4924,7 +4925,7 @@ def test_rc_spines(): @image_comparison(baseline_images=['rc_grid'], extensions=['png'], @@ -247,7 +261,7 @@ index a5b7331d3..03673d1d3 100644 def test_rc_grid(): fig = plt.figure() rc_dict0 = { -@@ -5443,7 +5445,7 @@ def test_date_timezone_y(): +@@ -5443,7 +5444,7 @@ def test_date_timezone_y(): @image_comparison(baseline_images=['date_timezone_x_and_y'], @@ -333,10 +347,10 @@ index 0803504ce..b3a615d5a 100644 def test_constrained_layout13(): 'Test that padding works.' diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py -index 0acaf6580..3837162f0 100644 +index 9868f4023..d8a490794 100644 --- a/lib/matplotlib/tests/test_contour.py +++ b/lib/matplotlib/tests/test_contour.py -@@ -216,7 +216,8 @@ def test_given_colors_levels_and_extends(): +@@ -227,7 +227,8 @@ def test_given_colors_levels_and_extends(): @image_comparison(baseline_images=['contour_datetime_axis'], @@ -346,7 +360,7 @@ index 0acaf6580..3837162f0 100644 def test_contour_datetime_axis(): fig = plt.figure() fig.subplots_adjust(hspace=0.4, top=0.98, bottom=.15) -@@ -242,7 +243,8 @@ def test_contour_datetime_axis(): +@@ -253,7 +254,8 @@ def test_contour_datetime_axis(): @image_comparison(baseline_images=['contour_test_label_transforms'], @@ -356,7 +370,7 @@ index 0acaf6580..3837162f0 100644 def test_labels(): # Adapted from pylab_examples example code: contour_demo.py # see issues #2475, #2843, and #2818 for explanation -@@ -273,7 +275,7 @@ def test_labels(): +@@ -284,7 +286,7 @@ def test_labels(): @image_comparison(baseline_images=['contour_corner_mask_False', 'contour_corner_mask_True'], @@ -365,6 +379,48 @@ index 0acaf6580..3837162f0 100644 def test_corner_mask(): n = 60 mask_level = 0.95 +diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py +index 8184d3eee..5a067f8e0 100644 +--- a/lib/matplotlib/tests/test_cycles.py ++++ b/lib/matplotlib/tests/test_cycles.py +@@ -10,7 +10,6 @@ from cycler import cycler + + + @image_comparison(baseline_images=['color_cycle_basic'], remove_text=True, +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + extensions=['png']) + def test_colorcycle_basic(): + fig, ax = plt.subplots() +@@ -28,7 +27,6 @@ def test_colorcycle_basic(): + + + @image_comparison(baseline_images=['marker_cycle', 'marker_cycle'], +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + remove_text=True, extensions=['png']) + def test_marker_cycle(): + fig, ax = plt.subplots() +@@ -62,7 +60,6 @@ def test_marker_cycle(): + + + @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True, +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + extensions=['png']) + def test_linestylecycle_basic(): + fig, ax = plt.subplots() +diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py +index 7cb5af621..d7d5ba2f0 100644 +--- a/lib/matplotlib/tests/test_figure.py ++++ b/lib/matplotlib/tests/test_figure.py +@@ -13,8 +13,7 @@ import numpy as np + import pytest + + +-@image_comparison(baseline_images=['figure_align_labels'], +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) ++@image_comparison(baseline_images=['figure_align_labels']) + def test_align_labels(): + # Check the figure.align_labels() command + fig = plt.figure(tight_layout=True) diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index 893108258..b409e9453 100644 --- a/lib/matplotlib/tests/test_image.py @@ -378,6 +434,36 @@ index 893108258..b409e9453 100644 remove_text=True, style='mpl20') def test_imshow_masked_interpolation(): +diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py +index 4f92f044f..5c128f85d 100644 +--- a/lib/matplotlib/tests/test_legend.py ++++ b/lib/matplotlib/tests/test_legend.py +@@ -108,7 +108,6 @@ def test_multiple_keys(): + + + @image_comparison(baseline_images=['rgba_alpha'], +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + extensions=['png'], remove_text=True) + def test_alpha_rgba(): + import matplotlib.pyplot as plt +@@ -120,7 +119,6 @@ def test_alpha_rgba(): + + + @image_comparison(baseline_images=['rcparam_alpha'], +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + extensions=['png'], remove_text=True) + def test_alpha_rcparam(): + import matplotlib.pyplot as plt +@@ -148,8 +146,7 @@ def test_fancy(): + ncol=2, shadow=True, title="My legend", numpoints=1) + + +-@image_comparison(baseline_images=['framealpha'], remove_text=True, +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) ++@image_comparison(baseline_images=['framealpha'], remove_text=True) + def test_framealpha(): + x = np.linspace(1, 100, 100) + y = x diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index a05c8b3c8..b6f11281f 100644 --- a/lib/matplotlib/tests/test_mathtext.py @@ -480,6 +566,18 @@ index 6275d5b54..a5c03f0a3 100644 def test_pre_transform_plotting(): # a catch-all for as many as possible plot layouts which handle # pre-transforming the data NOTE: The axis range is important in this +diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py +index 20840d7b8..80744294d 100644 +--- a/lib/matplotlib/tests/test_units.py ++++ b/lib/matplotlib/tests/test_units.py +@@ -41,7 +41,6 @@ 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'], +- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), + extensions=['png'], remove_text=False, style='mpl20') + def test_numpy_facade(): + # Create an instance of the conversion interface and diff --git a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py b/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py index 929c0368a..e6e5ca1ff 100644 --- a/lib/mpl_toolkits/tests/test_axisartist_floating_axes.py diff --git a/0003-Increase-some-tolerances-for-non-x86-arches.patch b/0003-Increase-some-tolerances-for-non-x86-arches.patch index 46164bc..3a37c41 100644 --- a/0003-Increase-some-tolerances-for-non-x86-arches.patch +++ b/0003-Increase-some-tolerances-for-non-x86-arches.patch @@ -1,4 +1,4 @@ -From ddc79a1ed71d0f566c21a01d72d7c8a107cf567d Mon Sep 17 00:00:00 2001 +From 9c6a5fc4cd346f0befa11ff1a82b6f24c6de4b71 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 31 Mar 2018 00:33:37 -0400 Subject: [PATCH 3/3] Increase some tolerances for non-x86 arches. diff --git a/python-matplotlib.spec b/python-matplotlib.spec index b131a1e..b324fd0 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -34,14 +34,14 @@ # Use the same directory of the main package for subpackage licence and docs %global _docdir_fmt %{name} -%global rctag rc1 +%global rctag rc2 # The version of FreeType in this Fedora branch. %global ftver 2.9.1 Name: python-matplotlib Version: 3.0.0 -Release: 0.1%{?rctag:.%{rctag}}%{?dist} +Release: 0.2%{?rctag:.%{rctag}}%{?dist} Summary: Python 2D plotting library # qt4_editor backend is MIT License: Python and MIT diff --git a/sources b/sources index cf5c82f..c685d3e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (matplotlib-3.0.0rc1.tar.gz) = 5601dc9da8fcf32d939e2856ab439b3d68aabffae581a5f7855bdff9d55f339e42f0960834aceca8076788132e447a32600445994ca6b05f509c0753416d2821 -SHA512 (matplotlib-3.0.0rc1-with-freetype-2.9.1.tar.gz) = 631d5f2a1d6a1f75f35081511c6d89c629253247b1ab81550ae3c90a22302979e25a22ee8d16746ebc112b4cf266d62a2219c53b1f70e7c71509fd35b0c3ee38 +SHA512 (matplotlib-3.0.0rc2.tar.gz) = d035204e61f70221ef5cd2aa6fbe4a883c01e4ef2f494eff3e29e0ec5d4a74139b8ea5fc4fd5892bb9c90586fbbdba035f71af0f0edebcad57c6856a3ad4d524 +SHA512 (matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz) = 5926a31aefbc7b6a387a560b990b80e8e003cb1847f544069b2b9262a20565d858a683497cfc786f97ae59582af5dc826e058fb4bccb20e3f2933a85c03538a2