commit: 89b4986c3ec4c5655d9d2f41516b5223ada89b42 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri May 2 20:17:21 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat May 3 06:07:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b4986c
dev-python/matplotlib: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Part-of: https://github.com/gentoo/gentoo/pull/41906 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../matplotlib/files/matplotlib-3.10.0-test.patch | 236 --------------------- 1 file changed, 236 deletions(-) diff --git a/dev-python/matplotlib/files/matplotlib-3.10.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.10.0-test.patch deleted file mode 100644 index aca01d0f5689..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.10.0-test.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py -index 254b86cb54..1f93b1a476 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(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02, -+ tol=0.015 if platform.machine() == 'x86_64' else 0.02, - savefig_kwarg=dict(dpi=100)) - def test_fancyarrow_dpi_cor_100dpi(): - """ -@@ -83,7 +83,7 @@ def test_fancyarrow_dpi_cor_100dpi(): - - - @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02, -+ tol=0.018 if platform.machine() == 'x86_64' else 0.02, - savefig_kwarg=dict(dpi=200)) - def test_fancyarrow_dpi_cor_200dpi(): - """ -@@ -116,7 +116,7 @@ def test_fancyarrow_dash(): - - - @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ tol=0.005 if platform.machine() == 'x86_64' else 0.02) - def test_arrow_styles(): - styles = mpatches.ArrowStyle.get_styles() - -diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index e3a59a1751..97352c887d 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -1220,7 +1220,7 @@ def test_imshow(): - - @image_comparison( - ['imshow_clip'], style='mpl20', -- tol=1.24 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x') else 0) -+ tol=1.24) - def test_imshow_clip(): - # As originally reported by Gellule Xg <[email protected]> - # use former defaults to match existing baseline image -@@ -2617,7 +2617,7 @@ def test_contour_hatching(): - - @image_comparison( - ['contour_colorbar'], style='mpl20', -- tol=0.54 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x') else 0) -+ tol=0.54) - def test_contour_colorbar(): - x, y, z = contour_dat() - -@@ -5045,7 +5045,7 @@ def test_vertex_markers(): - - - @image_comparison(['vline_hline_zorder', 'errorbar_zorder'], -- tol=0 if platform.machine() == 'x86_64' else 0.026) -+ tol=0.015 if platform.machine() == 'x86_64' else 0.026) - def test_eb_line_zorder(): - x = list(range(10)) - -@@ -9030,7 +9030,7 @@ def test_zorder_and_explicit_rasterization(): - - - @image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20", -- tol=0.027 if platform.machine() == "arm64" else 0) -+ tol=0.027 if platform.machine() == "arm64" else 0.02) - def test_preset_clip_paths(): - fig, ax = plt.subplots() - -diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py -index 24eeab6894..f140e031fe 100644 ---- a/lib/matplotlib/tests/test_colorbar.py -+++ b/lib/matplotlib/tests/test_colorbar.py -@@ -235,7 +235,7 @@ def test_colorbar_single_ax_panchor_east(constrained): - - - @image_comparison(['contour_colorbar.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.054) -+ tol=0.01 if platform.machine() == 'x86_64' else 0.054) - def test_contour_colorbar(): - fig, ax = plt.subplots(figsize=(4, 2)) - data = np.arange(1200).reshape(30, 40) - 500 -diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py -index e42e2ee9bf..040979eac1 100644 ---- a/lib/matplotlib/tests/test_constrainedlayout.py -+++ b/lib/matplotlib/tests/test_constrainedlayout.py -@@ -655,11 +655,11 @@ def test_compressed1(): - fig.draw_without_rendering() - - pos = axs[0, 0].get_position() -- np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3) -- np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3) -+ np.testing.assert_allclose(pos.x0, 0.06195, atol=2e-3) -+ np.testing.assert_allclose(pos.y1, 0.8537, atol=2e-3) - pos = axs[1, 2].get_position() -- np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3) -- np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3) -+ np.testing.assert_allclose(pos.x1, 0.8618, atol=2e-3) -+ np.testing.assert_allclose(pos.y0, 0.1934, atol=2e-3) - - - def test_compressed_suptitle(): -diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py -index e0ea82973a..8e304c7161 100644 ---- a/lib/matplotlib/tests/test_contour.py -+++ b/lib/matplotlib/tests/test_contour.py -@@ -418,8 +418,7 @@ def test_contourf_log_extension(): - - @image_comparison( - ['contour_addlines.png'], remove_text=True, style='mpl20', -- tol=0.15 if platform.machine() in ('aarch64', 'arm64', 'ppc64le', 's390x') -- else 0.03) -+ tol=0.15) - # tolerance is because image changed minutely when tick finding on - # colorbars was cleaned up... - def test_contour_addlines(): -diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py -index edf5ea05f1..afadc83056 100644 ---- a/lib/matplotlib/tests/test_figure.py -+++ b/lib/matplotlib/tests/test_figure.py -@@ -26,7 +26,7 @@ import matplotlib.dates as mdates - - - @image_comparison(['figure_align_labels'], extensions=['png', 'svg'], -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_align_labels(): - fig = plt.figure(layout='tight') - gs = gridspec.GridSpec(3, 3) -@@ -68,7 +68,7 @@ def test_align_labels(): - - @image_comparison(['figure_align_titles_tight.png', - 'figure_align_titles_constrained.png'], -- tol=0 if platform.machine() == 'x86_64' else 0.022, -+ tol=0.01 if platform.machine() == 'x86_64' else 0.022, - style='mpl20') - def test_align_titles(): - for layout in ['tight', 'constrained']: -diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 61892378bd..28d3661359 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -164,7 +164,7 @@ def test_multiple_keys(): - - - @image_comparison(['rgba_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.03) -+ tol=0.02 if platform.machine() == 'x86_64' else 0.03) - def test_alpha_rgba(): - fig, ax = plt.subplots() - ax.plot(range(10), lw=5) -@@ -173,7 +173,7 @@ def test_alpha_rgba(): - - - @image_comparison(['rcparam_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.03) -+ tol=0.02 if platform.machine() == 'x86_64' else 0.03) - def test_alpha_rcparam(): - fig, ax = plt.subplots() - ax.plot(range(10), lw=5) -@@ -201,7 +201,7 @@ def test_fancy(): - - - @image_comparison(['framealpha'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.024) -+ tol=0.02 if platform.machine() == 'x86_64' else 0.024) - def test_framealpha(): - x = np.linspace(1, 100, 100) - y = x -diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py -index ee8b5b4aaa..8752a56ad2 100644 ---- a/lib/matplotlib/tests/test_lines.py -+++ b/lib/matplotlib/tests/test_lines.py -@@ -185,7 +185,7 @@ def test_set_drawstyle(): - - @image_comparison( - ['line_collection_dashes'], remove_text=True, style='mpl20', -- tol=0 if platform.machine() == 'x86_64' else 0.65) -+ tol=0.65) - def test_set_line_coll_dash_image(): - fig, ax = plt.subplots() - np.random.seed(0) -diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py -index a8735e180b..7bd9f5a951 100644 ---- a/lib/matplotlib/tests/test_units.py -+++ b/lib/matplotlib/tests/test_units.py -@@ -79,7 +79,7 @@ def quantity_converter(): - # Tests that the conversion machinery works properly for classes that - # work as a facade over numpy arrays (like pint) - @image_comparison(['plot_pint.png'], style='mpl20', -- tol=0 if platform.machine() == 'x86_64' else 0.03) -+ tol=0.002 if platform.machine() == 'x86_64' else 0.03) - def test_numpy_facade(quantity_converter): - # use former defaults to match existing baseline image - plt.rcParams['axes.formatter.limits'] = -7, 7 -@@ -106,7 +106,7 @@ def test_numpy_facade(quantity_converter): - - # Tests gh-8908 - @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20', -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ tol=0.02) - def test_plot_masked_units(): - data = np.linspace(-5, 5) - data_masked = np.ma.array(data, mask=(data > -2) & (data < 2)) -diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py -index 342face450..c7256586bc 100644 ---- a/lib/matplotlib/tests/test_usetex.py -+++ b/lib/matplotlib/tests/test_usetex.py -@@ -15,6 +15,7 @@ import matplotlib.pyplot as plt - pytestmark = needs_usetex - - [email protected](reason="TODO: broken") - @image_comparison( - baseline_images=['test_usetex'], - extensions=['pdf', 'png'], -@@ -65,7 +66,7 @@ def test_mathdefault(): - fig.canvas.draw() - - --@image_comparison(['eqnarray.png']) -+@image_comparison(['eqnarray.png'], tol=23) - def test_multiline_eqnarray(): - text = ( - r'\begin{eqnarray*}' -@@ -163,7 +164,7 @@ except mpl.ExecutableNotFoundError: - - - @image_comparison(baseline_images=['rotation'], extensions=['eps', 'pdf', 'png', 'svg'], -- style='mpl20', tol=3.91 if _old_gs_version else 0) -+ style='mpl20', tol=30) - def test_rotation(): - mpl.rcParams['text.usetex'] = True -
