From b5e6655ad88ec745d0189667975eabdf52cd0c90 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 2 Mar 2019 18:39:03 -0500 Subject: [PATCH] Update to latest version. --- .gitignore | 1 + ...cks-and-titles-from-tight-bbox-tests.patch | 75 ------------ 0001-Use-packaged-jquery-and-jquery-ui.patch | 113 ++++++++++++++++++ 0001-matplotlibrc-path-search-fix.patch | 4 +- ...ase-tolerances-for-non-x86_64-arches.patch | 8 +- ...e-some-tolerances-for-32-bit-systems.patch | 58 ++++----- ...e-some-tolerances-for-non-x86-arches.patch | 18 +-- python-matplotlib.spec | 15 ++- sources | 2 +- 9 files changed, 170 insertions(+), 124 deletions(-) delete mode 100644 0001-Remove-ticks-and-titles-from-tight-bbox-tests.patch create mode 100644 0001-Use-packaged-jquery-and-jquery-ui.patch diff --git a/.gitignore b/.gitignore index 270f921..89314bf 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-3.0.1.tar.gz /matplotlib-3.0.1-with-freetype-2.9.1.tar.gz /matplotlib-3.0.2.tar.gz +/matplotlib-3.0.3.tar.gz diff --git a/0001-Remove-ticks-and-titles-from-tight-bbox-tests.patch b/0001-Remove-ticks-and-titles-from-tight-bbox-tests.patch deleted file mode 100644 index 35d6cfd..0000000 --- a/0001-Remove-ticks-and-titles-from-tight-bbox-tests.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 9ef2402bac96bbfc0fd9a21f56d8c4b3aae6e9a1 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Sat, 10 Nov 2018 04:29:36 -0500 -Subject: [PATCH] Remove ticks and titles from tight bbox tests. - -These text elements may shift with different versions of FreeType, -making the tight bbox results unstable when building against external -newer versions. - -Signed-off-by: Elliott Sales de Andrade ---- - lib/matplotlib/tests/test_axes.py | 6 ++++-- - lib/mpl_toolkits/tests/test_axes_grid1.py | 8 +++++--- - 2 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 5bc1b54bb..f6e3f733b 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -16,7 +16,8 @@ import pytest - import warnings - - import matplotlib --from matplotlib.testing.decorators import image_comparison, check_figures_equal -+from matplotlib.testing.decorators import ( -+ image_comparison, check_figures_equal, remove_ticks_and_titles) - import matplotlib.pyplot as plt - import matplotlib.markers as mmarkers - import matplotlib.patches as mpatches -@@ -5913,9 +5914,10 @@ def test_cartopy_backcompat(): - - def test_gettightbbox_ignoreNaN(): - fig, ax = plt.subplots() -+ remove_ticks_and_titles(fig) - t = ax.text(np.NaN, 1, 'Boo') - renderer = fig.canvas.get_renderer() -- np.testing.assert_allclose(ax.get_tightbbox(renderer).width, 532.444444) -+ np.testing.assert_allclose(ax.get_tightbbox(renderer).width, 496) - - - def test_scatter_series_non_zero_index(pd): -diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py -index 537a8a2c8..2a630bb14 100644 ---- a/lib/mpl_toolkits/tests/test_axes_grid1.py -+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py -@@ -1,6 +1,7 @@ - import matplotlib - import matplotlib.pyplot as plt --from matplotlib.testing.decorators import image_comparison -+from matplotlib.testing.decorators import ( -+ image_comparison, remove_ticks_and_titles) - - from mpl_toolkits.axes_grid1 import host_subplot - from mpl_toolkits.axes_grid1 import make_axes_locatable -@@ -409,7 +410,6 @@ def test_image_grid(): - - - def test_gettightbbox(): -- - fig, ax = plt.subplots(figsize=(8, 6)) - - l, = ax.plot([1, 2, 3], [0, 1, 0]) -@@ -418,6 +418,8 @@ def test_gettightbbox(): - ax_zoom.plot([1, 2, 3], [0, 1, 0]) - - mark_inset(ax, ax_zoom, loc1=1, loc2=3, fc="none", ec='0.3') -+ -+ remove_ticks_and_titles(fig) - bbox = fig.get_tightbbox(fig.canvas.get_renderer()) - np.testing.assert_array_almost_equal(bbox.extents, -- [-18.022743, -14.118056, 7.332813, 5.4625]) -+ [-17.7, -13.9, 7.2, 5.4]) --- -2.17.1 - diff --git a/0001-Use-packaged-jquery-and-jquery-ui.patch b/0001-Use-packaged-jquery-and-jquery-ui.patch new file mode 100644 index 0000000..1e844a6 --- /dev/null +++ b/0001-Use-packaged-jquery-and-jquery-ui.patch @@ -0,0 +1,113 @@ +From fede0d8731c1301720f16e2d46df8275e8ecf9e8 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sat, 2 Mar 2019 18:18:29 -0500 +Subject: [PATCH] Use packaged jquery and jquery-ui. + +Signed-off-by: Elliott Sales de Andrade +--- + .../backends/web_backend/all_figures.html | 6 +-- + .../backends/web_backend/single_figure.html | 6 +-- + setup.py | 46 ------------------- + 3 files changed, 6 insertions(+), 52 deletions(-) + +diff --git a/lib/matplotlib/backends/web_backend/all_figures.html b/lib/matplotlib/backends/web_backend/all_figures.html +index 41f48dc6d..69097eb4f 100644 +--- a/lib/matplotlib/backends/web_backend/all_figures.html ++++ b/lib/matplotlib/backends/web_backend/all_figures.html +@@ -3,9 +3,9 @@ + + + +- +- +- ++ ++ ++ + + + +diff --git a/lib/matplotlib/backends/web_backend/single_figure.html b/lib/matplotlib/backends/web_backend/single_figure.html +index 4d5a366fb..c11c86618 100644 +--- a/lib/matplotlib/backends/web_backend/single_figure.html ++++ b/lib/matplotlib/backends/web_backend/single_figure.html +@@ -3,9 +3,9 @@ + + + +- +- +- ++ ++ ++ + + +