diff options
Diffstat (limited to 'dev-python/matplotlib/files/matplotlib-3.8.0-test.patch')
-rw-r--r-- | dev-python/matplotlib/files/matplotlib-3.8.0-test.patch | 263 |
1 files changed, 0 insertions, 263 deletions
diff --git a/dev-python/matplotlib/files/matplotlib-3.8.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.8.0-test.patch deleted file mode 100644 index 5653ed6a697e..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.8.0-test.patch +++ /dev/null @@ -1,263 +0,0 @@ -From a39e8395b7f1a6388c4c0897aade3a176b7644a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 14 Feb 2023 20:46:30 +0100 -Subject: [PATCH] Adjust tolerances to make tests pass on real hardware - ---- - lib/matplotlib/tests/test_arrow_patches.py | 6 +++--- - lib/matplotlib/tests/test_axes.py | 9 +++++---- - lib/matplotlib/tests/test_colorbar.py | 2 +- - lib/matplotlib/tests/test_constrainedlayout.py | 8 ++++---- - lib/matplotlib/tests/test_contour.py | 3 +-- - lib/matplotlib/tests/test_figure.py | 2 +- - lib/matplotlib/tests/test_image.py | 2 +- - lib/matplotlib/tests/test_legend.py | 6 +++--- - lib/matplotlib/tests/test_lines.py | 2 +- - lib/matplotlib/tests/test_units.py | 4 ++-- - lib/matplotlib/tests/test_usetex.py | 5 +++-- - 11 files changed, 25 insertions(+), 24 deletions(-) - -diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py -index 8d573b4adb..dfc42efcb9 100644 ---- a/lib/matplotlib/tests/test_arrow_patches.py -+++ b/lib/matplotlib/tests/test_arrow_patches.py -@@ -67,7 +67,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(): - """ -@@ -82,7 +82,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(): - """ -@@ -115,7 +115,7 @@ def test_fancyarrow_dash(): - - - @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.005) -+ tol=0.005) - 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 30992d5780..0a254c95ca 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -1132,7 +1132,7 @@ def test_imshow(): - - @image_comparison( - ['imshow_clip'], style='mpl20', -- tol=1.24 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=1.24) - def test_imshow_clip(): - # As originally reported by Gellule Xg <gellule.xg@free.fr> - # use former defaults to match existing baseline image -@@ -2502,7 +2502,7 @@ def test_contour_hatching(): - - @image_comparison( - ['contour_colorbar'], style='mpl20', -- tol=0.54 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.54) - def test_contour_colorbar(): - x, y, z = contour_dat() - -@@ -4856,7 +4856,7 @@ def test_vertex_markers(): - - - @image_comparison(['vline_hline_zorder', 'errorbar_zorder'], -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ tol=0.015 if platform.machine() == 'x86_64' else 0.02) - def test_eb_line_zorder(): - x = list(range(10)) - -@@ -8709,7 +8709,8 @@ def test_zorder_and_explicit_rasterization(): - fig.savefig(b, format='pdf') - - --@image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20") -+@image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20", -+ tol=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 73c4dab9a8..ddae80c449 100644 ---- a/lib/matplotlib/tests/test_colorbar.py -+++ b/lib/matplotlib/tests/test_colorbar.py -@@ -236,7 +236,7 @@ def test_colorbar_single_ax_panchor_east(constrained): - - @image_comparison( - ['contour_colorbar.png'], remove_text=True, -- tol=0.01 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.01) - 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 6703dfe315..da7770b7c7 100644 ---- a/lib/matplotlib/tests/test_constrainedlayout.py -+++ b/lib/matplotlib/tests/test_constrainedlayout.py -@@ -652,11 +652,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) - - - @pytest.mark.parametrize('arg, state', [ -diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py -index 4a32fdc6ce..e745abb9dc 100644 ---- a/lib/matplotlib/tests/test_contour.py -+++ b/lib/matplotlib/tests/test_contour.py -@@ -383,8 +383,7 @@ def test_contourf_log_extension(split_collections): - @pytest.mark.parametrize("split_collections", [False, True]) - @image_comparison( - ['contour_addlines.png'], remove_text=True, style='mpl20', -- tol=0.15 if platform.machine() in ('aarch64', '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(split_collections): -diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py -index 6d6a3d772f..d6b5797b52 100644 ---- a/lib/matplotlib/tests/test_figure.py -+++ b/lib/matplotlib/tests/test_figure.py -@@ -27,7 +27,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) -diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py -index aeeebd136b..2e5a44a9e6 100644 ---- a/lib/matplotlib/tests/test_image.py -+++ b/lib/matplotlib/tests/test_image.py -@@ -1352,7 +1352,7 @@ def test_nonuniform_and_pcolor(): - - @image_comparison( - ['rgba_antialias.png'], style='mpl20', remove_text=True, -- tol=0.007 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.007) - def test_rgba_antialias(): - fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False, - sharey=False, constrained_layout=True) -diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 759ac6aada..fc35d42542 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -173,7 +173,7 @@ def test_multiple_keys(): - - - @image_comparison(['rgba_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_alpha_rgba(): - fig, ax = plt.subplots() - ax.plot(range(10), lw=5) -@@ -182,7 +182,7 @@ def test_alpha_rgba(): - - - @image_comparison(['rcparam_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_alpha_rcparam(): - fig, ax = plt.subplots() - ax.plot(range(10), lw=5) -@@ -210,7 +210,7 @@ def test_fancy(): - - - @image_comparison(['framealpha'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ tol=0.02) - 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 4f23e6969b..952c643e35 100644 ---- a/lib/matplotlib/tests/test_lines.py -+++ b/lib/matplotlib/tests/test_lines.py -@@ -187,7 +187,7 @@ def test_set_drawstyle(): - - @image_comparison( - ['line_collection_dashes'], remove_text=True, style='mpl20', -- tol=0.65 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ 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 d3b8c5a716..56a1d0a0a4 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.01) -+ tol=0.002 if platform.machine() == 'x86_64' else 0.01) - 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.01) -+ 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 - - -+@pytest.mark.skip(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 - --- -2.42.0 - |