From d2fa0263b8b678a7097f66c68682eaecfa4a051c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 18 Sep 2018 04:51:42 -0400 Subject: [PATCH] Update to final 3.0.0. --- .gitignore | 2 ++ 0001-matplotlibrc-path-search-fix.patch | 2 +- ...crease-tolerances-for-non-x86_64-arches.patch | 2 +- ...ease-some-tolerances-for-32-bit-systems.patch | 16 ++++++++-------- ...ease-some-tolerances-for-non-x86-arches.patch | 14 +++++++------- python-matplotlib.spec | 4 ++-- sources | 4 ++-- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 086d915..8dc07d2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ matplotlib-1.0.0-without-gpc.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 +/matplotlib-3.0.0.tar.gz +/matplotlib-3.0.0-with-freetype-2.9.1.tar.gz diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 464bb46..58a89f6 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,4 +1,4 @@ -From c9bf5a0f69ae4f7f73f60a17237b95452081ab79 Mon Sep 17 00:00:00 2001 +From 2ff8ec9b9047b8197d96e651e038eab73e3a6cd2 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 diff --git a/0002-Increase-tolerances-for-non-x86_64-arches.patch b/0002-Increase-tolerances-for-non-x86_64-arches.patch index 31e2cbc..27c12d5 100644 --- a/0002-Increase-tolerances-for-non-x86_64-arches.patch +++ b/0002-Increase-tolerances-for-non-x86_64-arches.patch @@ -1,4 +1,4 @@ -From 2886eadf6aff7c8faca2ea0f1bb7d1966e9a77b9 Mon Sep 17 00:00:00 2001 +From 9b67dee47af3705cacc41d639f31a9bc99934111 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. diff --git a/0003-Increase-some-tolerances-for-32-bit-systems.patch b/0003-Increase-some-tolerances-for-32-bit-systems.patch index 99ae5b5..b6fa351 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 c7eb73b3a73d2aaced7c63a314f0ef724fa4c416 Mon Sep 17 00:00:00 2001 +From a9c30f31914db1afc25a7e56ab0a02633b7b1f37 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. @@ -57,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..2549ff16f 100644 +index 6afed91f3..e931e7a4a 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -553,7 +553,7 @@ def test_single_point(): @@ -233,7 +233,7 @@ index a5b7331d3..2549ff16f 100644 def test_horiz_violinplot_custompoints_200(): ax = plt.axes() # First 9 digits of frac(sqrt(43)) -@@ -3350,8 +3352,7 @@ def test_vertex_markers(): +@@ -3347,8 +3349,7 @@ def test_vertex_markers(): @image_comparison(baseline_images=['vline_hline_zorder', @@ -243,7 +243,7 @@ index a5b7331d3..2549ff16f 100644 def test_eb_line_zorder(): x = list(range(10)) -@@ -4031,7 +4032,7 @@ def test_psd_noise(): +@@ -4028,7 +4029,7 @@ def test_psd_noise(): @image_comparison(baseline_images=['csd_freqs'], remove_text=True, @@ -252,7 +252,7 @@ index a5b7331d3..2549ff16f 100644 def test_csd_freqs(): '''test axes.csd with sinusoidal stimuli''' n = 10000 -@@ -4924,7 +4925,7 @@ def test_rc_spines(): +@@ -4921,7 +4922,7 @@ def test_rc_spines(): @image_comparison(baseline_images=['rc_grid'], extensions=['png'], @@ -261,7 +261,7 @@ index a5b7331d3..2549ff16f 100644 def test_rc_grid(): fig = plt.figure() rc_dict0 = { -@@ -5443,7 +5444,7 @@ def test_date_timezone_y(): +@@ -5440,7 +5441,7 @@ def test_date_timezone_y(): @image_comparison(baseline_images=['date_timezone_x_and_y'], @@ -284,7 +284,7 @@ index 6812ee1ad..5e5f19aac 100644 from mpl_toolkits.mplot3d import Axes3D diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py -index 2230c20e7..10974be95 100644 +index 56a829418..949eaf1b7 100644 --- a/lib/matplotlib/tests/test_colorbar.py +++ b/lib/matplotlib/tests/test_colorbar.py @@ -93,7 +93,7 @@ def _colorbar_extension_length(spacing): @@ -435,7 +435,7 @@ index 893108258..b409e9453 100644 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 +index d508d6f41..69286069d 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -108,7 +108,6 @@ def test_multiple_keys(): diff --git a/0003-Increase-some-tolerances-for-non-x86-arches.patch b/0003-Increase-some-tolerances-for-non-x86-arches.patch index 3a37c41..106bfdb 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 9c6a5fc4cd346f0befa11ff1a82b6f24c6de4b71 Mon Sep 17 00:00:00 2001 +From 642f104f23c78af5d6010916961ec62779290ea5 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. @@ -44,7 +44,7 @@ index f678fbed3..bac0cb802 100644 def test_fancyarrow_dpi_cor_200dpi(): """ diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index a5b7331d3..71b1bc734 100644 +index 6afed91f3..755be5570 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -386,7 +386,7 @@ def test_annotate_default_arrow(): @@ -56,7 +56,7 @@ index a5b7331d3..71b1bc734 100644 def test_polar_annotations(): # you can specify the xypoint and the xytext in different # positions and coordinate systems, and optionally turn on a -@@ -3351,7 +3351,7 @@ def test_vertex_markers(): +@@ -3348,7 +3348,7 @@ def test_vertex_markers(): @image_comparison(baseline_images=['vline_hline_zorder', 'errorbar_zorder'], @@ -65,7 +65,7 @@ index a5b7331d3..71b1bc734 100644 def test_eb_line_zorder(): x = list(range(10)) -@@ -5123,7 +5123,7 @@ def test_title_location_roundtrip(): +@@ -5120,7 +5120,7 @@ def test_title_location_roundtrip(): @image_comparison(baseline_images=["loglog"], remove_text=True, extensions=['png'], @@ -75,10 +75,10 @@ index a5b7331d3..71b1bc734 100644 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 10458dddf..ef2ae5db5 100644 +index 7ba47be93..bf05c5286 100644 --- a/lib/matplotlib/tests/test_backends_interactive.py +++ b/lib/matplotlib/tests/test_backends_interactive.py -@@ -102,7 +102,7 @@ fig.canvas.mpl_connect("draw_event", lambda event: timer.start()) +@@ -101,7 +101,7 @@ fig.canvas.mpl_connect("draw_event", lambda event: timer.start()) plt.show() """ @@ -171,7 +171,7 @@ index 893108258..cf7975071 100644 def test_imshow_masked_interpolation(): diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 4f92f044f..ba1143cb1 100644 +index d508d6f41..9147ef336 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -108,7 +108,7 @@ def test_multiple_keys(): diff --git a/python-matplotlib.spec b/python-matplotlib.spec index b324fd0..9085af7 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 rc2 +#global rctag rc1 # The version of FreeType in this Fedora branch. %global ftver 2.9.1 Name: python-matplotlib Version: 3.0.0 -Release: 0.2%{?rctag:.%{rctag}}%{?dist} +Release: 1%{?rctag:.%{rctag}}%{?dist} Summary: Python 2D plotting library # qt4_editor backend is MIT License: Python and MIT diff --git a/sources b/sources index c685d3e..9d536ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (matplotlib-3.0.0rc2.tar.gz) = d035204e61f70221ef5cd2aa6fbe4a883c01e4ef2f494eff3e29e0ec5d4a74139b8ea5fc4fd5892bb9c90586fbbdba035f71af0f0edebcad57c6856a3ad4d524 -SHA512 (matplotlib-3.0.0rc2-with-freetype-2.9.1.tar.gz) = 5926a31aefbc7b6a387a560b990b80e8e003cb1847f544069b2b9262a20565d858a683497cfc786f97ae59582af5dc826e058fb4bccb20e3f2933a85c03538a2 +SHA512 (matplotlib-3.0.0.tar.gz) = 1bcc665a3557655308c3688c747be4d35fce8742db67eda0cb494a550269bf4fba84d78b36f8296f82919b4cec50b5d23c9ce6d1f3a312a9d2dfaf3b2332b335 +SHA512 (matplotlib-3.0.0-with-freetype-2.9.1.tar.gz) = d22e280d66fb018ef1dd6f91f086dbef3eed8bc39bf43fa270a31552984e87f054d937a031cf675e5ecce45f2e46d83e838f18c9c00616cc2a204d2d03075bb6