Adding metadata

1 files changed, 66 insertions, 69 deletions

diff --git a/dev-python/matplotlib/files/matplotlib-3.9.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.10.3-test.patch
index db8ab5e2a0fb..b58b0c5bca41 100644
--- a/dev-python/matplotlib/files/matplotlib-3.9.0-test.patch
+++ b/dev-python/matplotlib/files/matplotlib-3.10.3-test.patch
@@ -1,5 +1,23 @@
+From 54ef285784b7519dfbe4170662d09518b237c7d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 28 Feb 2025 04:30:34 +0100
+Subject: [PATCH] adjust tests
+
+---
+ lib/matplotlib/tests/test_arrow_patches.py     | 6 +++---
+ lib/matplotlib/tests/test_axes.py              | 8 ++++----
+ lib/matplotlib/tests/test_colorbar.py          | 2 +-
+ lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
+ lib/matplotlib/tests/test_contour.py           | 2 +-
+ lib/matplotlib/tests/test_figure.py            | 4 ++--
+ 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 +++--
+ 10 files changed, 21 insertions(+), 20 deletions(-)
+
 diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index 254b86cb54..1f93b1a476 100644
+index c2b6d4fa80..3527022043 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():
@@ -30,47 +48,47 @@ index 254b86cb54..1f93b1a476 100644
      styles = mpatches.ArrowStyle.get_styles()
  
 diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 0ed5a11c13..c57ed9934e 100644
+index e3fc1ada99..1c387ef2df 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
-@@ -1157,7 +1157,7 @@ def test_imshow():
+@@ -1214,7 +1214,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)
+ 
+ @image_comparison(['imshow_clip'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 1.24)
++                  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
-@@ -2541,7 +2541,7 @@ def test_contour_hatching():
+@@ -2648,7 +2648,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)
+ 
+ @image_comparison(['contour_colorbar'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.54)
++                  tol=0.54)
  def test_contour_colorbar():
      x, y, z = contour_dat()
  
-@@ -4902,7 +4902,7 @@ def test_vertex_markers():
+@@ -5176,7 +5176,7 @@ def test_vertex_markers():
  
  
- @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+ @image_comparison(['vline_hline_zorder.png', 'errorbar_zorder.png'],
 -                  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))
  
-@@ -8810,7 +8810,7 @@ def test_zorder_and_explicit_rasterization():
+@@ -9161,7 +9161,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)
+-                  tol=0 if platform.machine() == 'x86_64' else 0.027)
++                  tol=0.027)
  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 35911afc79..852075c78d 100644
+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):
@@ -83,41 +101,33 @@ index 35911afc79..852075c78d 100644
      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 4dc4d9501e..015e46cbe4 100644
+index 7c7dd43a31..fd64eced4b 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)
+@@ -200,7 +200,7 @@ def test_constrained_layout9():
  
  
- @pytest.mark.parametrize('arg, state', [
+ @image_comparison(['constrained_layout10.png'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.032)
++                  tol=0.02 if platform.machine() == 'x86_64' else 0.032)
+ def test_constrained_layout10():
+     """Test for handling legend outside axis"""
+     fig, axs = plt.subplots(2, 2, layout="constrained")
 diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index d4600a14fe..d2deff9362 100644
+index 543cff18c6..6e113bc897 100644
 --- a/lib/matplotlib/tests/test_contour.py
 +++ b/lib/matplotlib/tests/test_contour.py
-@@ -442,8 +442,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)
+@@ -417,7 +417,7 @@ def test_contourf_log_extension():
+ 
+ 
+ @image_comparison(['contour_addlines.png'], remove_text=True, style='mpl20',
+-                  tol=0.03 if platform.machine() == 'x86_64' else 0.15)
++                  tol=0.15)
  # tolerance is because image changed minutely when tick finding on
  # colorbars was cleaned up...
- def test_contour_addlines(split_collections):
+ def test_contour_addlines():
 diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 58aecd3dea..53f3145cbd 100644
+index 3a4ced2540..62ce098d50 100644
 --- a/lib/matplotlib/tests/test_figure.py
 +++ b/lib/matplotlib/tests/test_figure.py
 @@ -26,7 +26,7 @@ import matplotlib.dates as mdates
@@ -138,24 +148,11 @@ index 58aecd3dea..53f3145cbd 100644
                    style='mpl20')
  def test_align_titles():
      for layout in ['tight', 'constrained']:
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 1602f86716..c2bc71e22f 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -1416,7 +1416,7 @@ def test_nonuniform_and_pcolor():
- 
- @image_comparison(
-     ['rgba_antialias.png'], style='mpl20', remove_text=True,
--    tol=0 if platform.machine() == 'x86_64' else 0.007)
-+    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 0353f1408b..4c15058e7a 100644
+index 5e69044866..1480f7c663 100644
 --- a/lib/matplotlib/tests/test_legend.py
 +++ b/lib/matplotlib/tests/test_legend.py
-@@ -177,7 +177,7 @@ def test_multiple_keys():
+@@ -165,7 +165,7 @@ def test_multiple_keys():
  
  
  @image_comparison(['rgba_alpha.png'], remove_text=True,
@@ -164,7 +161,7 @@ index 0353f1408b..4c15058e7a 100644
  def test_alpha_rgba():
      fig, ax = plt.subplots()
      ax.plot(range(10), lw=5)
-@@ -186,7 +186,7 @@ def test_alpha_rgba():
+@@ -174,7 +174,7 @@ def test_alpha_rgba():
  
  
  @image_comparison(['rcparam_alpha.png'], remove_text=True,
@@ -173,7 +170,7 @@ index 0353f1408b..4c15058e7a 100644
  def test_alpha_rcparam():
      fig, ax = plt.subplots()
      ax.plot(range(10), lw=5)
-@@ -214,7 +214,7 @@ def test_fancy():
+@@ -202,7 +202,7 @@ def test_fancy():
  
  
  @image_comparison(['framealpha'], remove_text=True,
@@ -183,23 +180,23 @@ index 0353f1408b..4c15058e7a 100644
      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 531237b2ba..0e37450e1a 100644
+index 81252198cd..dd62412b44 100644
 --- a/lib/matplotlib/tests/test_lines.py
 +++ b/lib/matplotlib/tests/test_lines.py
-@@ -185,7 +185,7 @@ def test_set_drawstyle():
+@@ -184,7 +184,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)
+ 
+ @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 ae6372fea1..4f0dc25732 100644
+index cc71f68585..1fd3b50fea 100644
 --- a/lib/matplotlib/tests/test_units.py
 +++ b/lib/matplotlib/tests/test_units.py
-@@ -79,7 +79,7 @@ def quantity_converter():
+@@ -81,7 +81,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',
@@ -208,7 +205,7 @@ index ae6372fea1..4f0dc25732 100644
  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):
+@@ -108,7 +108,7 @@ def test_numpy_facade(quantity_converter):
  
  # Tests gh-8908
  @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',