From 3fa499ba45223d5a6b630dde7537a024971792d0 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mar 18 2020 07:28:30 +0000 Subject: Update to latest version. --- diff --git a/.gitignore b/.gitignore index 2a65cc3..921a73c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-3.2.0rc3-with-freetype-2.10.1.tar.gz /matplotlib-3.2.0.tar.gz /matplotlib-3.2.0-with-freetype-2.10.1.tar.gz +/matplotlib-3.2.1.tar.gz diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 8c93de1..8237365 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,19 +1,19 @@ -From 4fa2feb3b74904723c038c80303cddb52b68718d Mon Sep 17 00:00:00 2001 +From 45f0f90c1a4d55f13c6067ef1abaa821d30b9faf Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 Subject: [PATCH 1/4] matplotlibrc path search fix Signed-off-by: Elliott Sales de Andrade --- - lib/matplotlib/__init__.py | 30 ++++----------------------- - lib/matplotlib/tests/test_rcparams.py | 15 ++++++++++---- - 2 files changed, 15 insertions(+), 30 deletions(-) + lib/matplotlib/__init__.py | 31 ++++----------------------- + lib/matplotlib/tests/test_rcparams.py | 15 +++++++++---- + 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index c4dba5f29..c56f5ca14 100644 +index fa1caecda..d2bd48800 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py -@@ -631,32 +631,11 @@ def _get_data_path(): +@@ -654,34 +654,12 @@ def _get_data_path(): "3.1", name="MATPLOTLIBDATA", obj_type="environment variable") return path @@ -21,6 +21,7 @@ index c4dba5f29..c56f5ca14 100644 + path = (Path(__file__).parent.parent.parent.parent.parent / + 'share/matplotlib/mpl-data') if path.is_dir(): + defaultParams['datapath'][0] = str(path) return str(path) - cbook.warn_deprecated( @@ -43,12 +44,13 @@ index c4dba5f29..c56f5ca14 100644 - - for path in get_candidate_paths(): - if path.is_dir(): +- defaultParams['datapath'][0] = str(path) - return str(path) - raise RuntimeError('Could not find the matplotlib data files') -@@ -694,8 +673,7 @@ def matplotlib_fname(): +@@ -712,8 +690,7 @@ def matplotlib_fname(): is not defined) - On other platforms, - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined @@ -58,11 +60,11 @@ index c4dba5f29..c56f5ca14 100644 """ def gen_candidates(): -@@ -708,7 +686,7 @@ def matplotlib_fname(): +@@ -726,7 +703,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 os.path.join(_get_data_path(), 'matplotlibrc') + yield '/etc/matplotlibrc' for fname in gen_candidates(): diff --git a/0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch b/0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch index 7bf0874..1807548 100644 --- a/0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch +++ b/0002-Set-FreeType-version-to-2.10.1-and-update-tolerances.patch @@ -1,4 +1,4 @@ -From 1a08b9ab19b817d9deaa7a03ed29a1452fafe3e4 Mon Sep 17 00:00:00 2001 +From cff0aeead7f2e1b570613dbec8c67d0f715fc87e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 14 Feb 2020 06:05:42 -0500 Subject: [PATCH 2/4] Set FreeType version to 2.10.1 and update tolerances. @@ -13,10 +13,10 @@ Signed-off-by: Elliott Sales de Andrade 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index c56f5ca14..11eee4fcf 100644 +index d2bd48800..ff06bf049 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py -@@ -1292,7 +1292,7 @@ default_test_modules = [ +@@ -1313,7 +1313,7 @@ default_test_modules = [ def _init_tests(): # The version of FreeType to install locally for running the # tests. This must match the value in `setupext.py` @@ -26,10 +26,10 @@ index c56f5ca14..11eee4fcf 100644 from matplotlib import ft2font if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 5edb4f24b..ba9c2005b 100644 +index 93548b279..de146a527 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py -@@ -6400,7 +6400,7 @@ def test_normal_axes(): +@@ -6405,7 +6405,7 @@ def test_normal_axes(): ] for nn, b in enumerate(bbaxis): targetbb = mtransforms.Bbox.from_bounds(*target[nn]) @@ -38,7 +38,7 @@ index 5edb4f24b..ba9c2005b 100644 target = [ [150.0, 119.999, 930.0, 11.111], -@@ -6418,7 +6418,7 @@ def test_normal_axes(): +@@ -6423,7 +6423,7 @@ def test_normal_axes(): target = [85.5138, 75.88888, 1021.11, 1017.11] targetbb = mtransforms.Bbox.from_bounds(*target) @@ -47,7 +47,7 @@ index 5edb4f24b..ba9c2005b 100644 # test that get_position roundtrips to get_window_extent axbb = ax.get_position().transformed(fig.transFigure).bounds -@@ -6543,7 +6543,7 @@ def test_get_tightbbox_polar(): +@@ -6548,7 +6548,7 @@ def test_get_tightbbox_polar(): fig.canvas.draw() bb = ax.get_tightbbox(fig.canvas.get_renderer()) assert_allclose(bb.extents, diff --git a/0003-Increase-tolerances-for-non-x86_64-arches.patch b/0003-Increase-tolerances-for-non-x86_64-arches.patch index 479e507..424bbc7 100644 --- a/0003-Increase-tolerances-for-non-x86_64-arches.patch +++ b/0003-Increase-tolerances-for-non-x86_64-arches.patch @@ -1,4 +1,4 @@ -From 743d1b3370b37c6e4798c941867a43d1118f771b Mon Sep 17 00:00:00 2001 +From 8652868372a2a227091c457f1c711f2b6dd6af40 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 23 Jan 2018 20:27:17 -0500 Subject: [PATCH 3/4] Increase tolerances for non-x86_64 arches. diff --git a/0004-Increase-some-tolerances-for-32-bit-systems.patch b/0004-Increase-some-tolerances-for-32-bit-systems.patch index 01b052c..a70e4b5 100644 --- a/0004-Increase-some-tolerances-for-32-bit-systems.patch +++ b/0004-Increase-some-tolerances-for-32-bit-systems.patch @@ -1,4 +1,4 @@ -From ce08fe59398bf0bb68ca90fa4c1bf992613f5d19 Mon Sep 17 00:00:00 2001 +From 9e7be0a26644ec35dde39fb332837baab80f91cb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 31 Mar 2018 00:15:14 -0400 Subject: [PATCH 4/4] Increase some tolerances for 32-bit systems. @@ -30,10 +30,10 @@ Signed-off-by: Elliott Sales de Andrade 22 files changed, 60 insertions(+), 70 deletions(-) diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py -index 7965d45e4..6f5022ffa 100644 +index 7d0941233..29df3f284 100644 --- a/lib/matplotlib/testing/decorators.py +++ b/lib/matplotlib/testing/decorators.py -@@ -268,7 +268,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol, +@@ -269,7 +269,7 @@ def _pytest_image_comparison(baseline_images, extensions, tol, return decorator @@ -56,7 +56,7 @@ index a598e822d..becc9b46d 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 ba9c2005b..6bf56374c 100644 +index de146a527..4d7a3ba47 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -563,7 +563,7 @@ def test_single_point(): @@ -231,7 +231,7 @@ index ba9c2005b..6bf56374c 100644 def test_horiz_violinplot_custompoints_200(): ax = plt.axes() # First 9 digits of frac(sqrt(43)) -@@ -3647,8 +3648,7 @@ def test_vertex_markers(): +@@ -3652,8 +3653,7 @@ def test_vertex_markers(): ax.set_ylim([-1, 10]) @@ -241,7 +241,7 @@ index ba9c2005b..6bf56374c 100644 def test_eb_line_zorder(): x = list(range(10)) -@@ -4335,7 +4335,7 @@ def test_psd_noise(): +@@ -4340,7 +4340,7 @@ def test_psd_noise(): ax3.set_ylabel('') @@ -250,7 +250,7 @@ index ba9c2005b..6bf56374c 100644 def test_csd_freqs(): '''test axes.csd with sinusoidal stimuli''' n = 10000 -@@ -5239,7 +5239,7 @@ def test_rc_spines(): +@@ -5244,7 +5244,7 @@ def test_rc_spines(): fig, ax = plt.subplots() @@ -259,7 +259,7 @@ index ba9c2005b..6bf56374c 100644 def test_rc_grid(): fig = plt.figure() rc_dict0 = { -@@ -5781,7 +5781,7 @@ def test_date_timezone_y(): +@@ -5786,7 +5786,7 @@ def test_date_timezone_y(): plt.plot_date([3] * 3, time_index, tz='UTC', xdate=False, ydate=True) @@ -470,7 +470,7 @@ index 71499da44..42413a5c1 100644 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 fdf930184..6bf204f8b 100644 +index 508e29fa0..f6862e631 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -172,7 +172,7 @@ def baseline_images(request, fontset, index): @@ -532,7 +532,7 @@ index 0fad3cdf2..aab0b29c6 100644 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 68031bff2..68d84d60e 100644 +index 719c8fbc1..fd28062e1 100644 --- a/lib/matplotlib/tests/test_quiver.py +++ b/lib/matplotlib/tests/test_quiver.py @@ -173,7 +173,7 @@ def test_quiver_key_xy(): diff --git a/0004-Increase-some-tolerances-for-non-x86-arches.patch b/0004-Increase-some-tolerances-for-non-x86-arches.patch index 0921a85..e0cf48d 100644 --- a/0004-Increase-some-tolerances-for-non-x86-arches.patch +++ b/0004-Increase-some-tolerances-for-non-x86-arches.patch @@ -1,4 +1,4 @@ -From a37200542ac349b98dc64f4e697396b80f42f0d9 Mon Sep 17 00:00:00 2001 +From 8b585994418d62cde4a525f4e6a14aeba42459f4 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 31 Mar 2018 00:33:37 -0400 Subject: [PATCH 4/4] Increase some tolerances for non-x86 arches. @@ -43,7 +43,7 @@ index a9409e2c1..9627b3569 100644 def test_fancyarrow_dpi_cor_200dpi(): """ diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index ba9c2005b..5da72b9ed 100644 +index de146a527..8574a95d2 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -407,7 +407,7 @@ def test_annotate_default_arrow(): @@ -55,7 +55,7 @@ index ba9c2005b..5da72b9ed 100644 def test_polar_annotations(): # you can specify the xypoint and the xytext in different # positions and coordinate systems, and optionally turn on a -@@ -3648,7 +3648,7 @@ def test_vertex_markers(): +@@ -3653,7 +3653,7 @@ def test_vertex_markers(): @image_comparison(['vline_hline_zorder', 'errorbar_zorder'], diff --git a/16656.patch b/16656.patch deleted file mode 100644 index 26e7d2a..0000000 --- a/16656.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 957abbb637931558a2785941981c05401c2050d7 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Wed, 4 Mar 2020 00:00:56 -0500 -Subject: [PATCH] Make test_imagegrid_cbar_mode_edge less flaky. - -Since parametrizing the test allows it to run in parallel, this makes it -flaky, as one process can overwrite the test result image of another. - -Our standard way for dealing with tests that use the same baseline image -is to pass duplicate filenames to `image_comparison`, because that is -serialized. ---- - lib/mpl_toolkits/tests/test_axes_grid.py | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/lib/mpl_toolkits/tests/test_axes_grid.py b/lib/mpl_toolkits/tests/test_axes_grid.py -index 58358b68665..6c88ba9794e 100644 ---- a/lib/mpl_toolkits/tests/test_axes_grid.py -+++ b/lib/mpl_toolkits/tests/test_axes_grid.py -@@ -12,10 +12,16 @@ - # The original version of this test relied on mpl_toolkits's slightly different - # colorbar implementation; moving to matplotlib's own colorbar implementation - # caused the small image comparison error. --@pytest.mark.parametrize("legacy_colorbar", [False, True]) --@image_comparison(['imagegrid_cbar_mode.png'], -+@image_comparison(['imagegrid_cbar_mode.png'] * 2, - remove_text=True, style='mpl20', tol=0.3) --def test_imagegrid_cbar_mode_edge(legacy_colorbar): -+def test_imagegrid_cbar_mode_edge(): -+ # Note, we don't use @pytest.mark.parametrize, because in parallel this -+ # might cause one process result to overwrite another's. -+ for legacy_colorbar in [False, True]: -+ _test_imagegrid_cbar_mode_edge(legacy_colorbar) -+ -+ -+def _test_imagegrid_cbar_mode_edge(legacy_colorbar): - mpl.rcParams["mpl_toolkits.legacy_colorbar"] = legacy_colorbar - - X, Y = np.meshgrid(np.linspace(0, 6, 30), np.linspace(0, 6, 30)) diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 508021d..40c0be7 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -43,7 +43,7 @@ %global ftver 2.10.1 Name: python-matplotlib -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?rctag:.%{rctag}}%{?dist} Summary: Python 2D plotting library # qt4_editor backend is MIT @@ -59,10 +59,6 @@ Patch0001: 0001-Force-using-system-qhull.patch # Don't attempt to download jQuery and jQuery UI Patch0002: 0001-Use-packaged-jquery-and-jquery-ui.patch -# Fix a flaky test -# https://github.com/matplotlib/matplotlib/pull/16656 -Patch0003: https://github.com/matplotlib/matplotlib/pull/16656.patch - # Fedora-specific patches; see: # https://github.com/fedora-python/matplotlib/tree/fedora-patches # https://github.com/fedora-python/matplotlib/tree/fedora-patches-non-x86 @@ -264,8 +260,6 @@ Requires: python3-matplotlib%{?_isa} = %{version}-%{release} %patch0002 -p1 -%patch0003 -p1 - # Fedora-specific patches follow: %patch1001 -p1 # Updated test images for new FreeType. @@ -435,6 +429,9 @@ PYTHONDONTWRITEBYTECODE=1 \ %changelog +* Wed Mar 18 2020 Elliott Sales de Andrade - 3.2.1-1 +- Update to latest version + * Tue Mar 03 2020 Elliott Sales de Andrade - 3.2.0-1 - Update to latest version diff --git a/sources b/sources index d61d95a..864b76e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (matplotlib-3.2.0.tar.gz) = bbc800b3f6c2d4d1161f7b6cc6c72c637abe9d70adfc17bb02d6e21022c957e485d6da02209163460c9bb96eaf544e09c8eba9f80ac30ec95348b6dff3d32ebb +SHA512 (matplotlib-3.2.1.tar.gz) = 2725ebb2e3665f3f110354efab6a6ec20721667acbaf1dc22a9396dbdca096edaabe79b0e602970b1c0769a5eb849cd815774af00a366f3d4e2f336bce06208e SHA512 (matplotlib-3.2.0-with-freetype-2.10.1.tar.gz) = 5fefa148dae612b431bbf1430f93df20f3cfc06f01db072148893bf067f1fab5c9944575a3d1a587fe7d44b17fb755f4532bf61dfdb7fc64b2fd7821f9fa12ac