From 2c085d91152d07e0081070c0d56b3889bcba62a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 May 2025 12:58:51 +0100 Subject: gentoo auto-resync : 11:05:2025 - 12:58:50 --- dev-python/matplotlib/Manifest | 8 +- .../matplotlib/files/matplotlib-3.10.3-test.patch | 246 ++++++++++++++++ .../matplotlib/files/matplotlib-3.9.0-test.patch | 249 ---------------- dev-python/matplotlib/matplotlib-3.10.1.ebuild | 5 +- dev-python/matplotlib/matplotlib-3.10.3.ebuild | 328 +++++++++++++++++++++ dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild | 300 ------------------- 6 files changed, 581 insertions(+), 555 deletions(-) create mode 100644 dev-python/matplotlib/files/matplotlib-3.10.3-test.patch delete mode 100644 dev-python/matplotlib/files/matplotlib-3.9.0-test.patch create mode 100644 dev-python/matplotlib/matplotlib-3.10.3.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild (limited to 'dev-python/matplotlib') diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index e168cc542de9..9728564abd81 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,8 +1,8 @@ AUX matplotlib-3.10.1-test.patch 9626 BLAKE2B 4e7a2b056c122fbd89ce38417526b350bfae7fb41770e1f7e53b463840d48800619fe1fb35eb32279b8b80c7dbe88fe31a67ccadba6aad70c1efef8683d4ee29 SHA512 ca3cb17124d151ccda33cadca326462a3923271596d9f79ef021f243715e1d0bb03c3cb00f6c799b2a9d1fd106281730adb9e71679f0549aa43050089e7c4898 -AUX matplotlib-3.9.0-test.patch 10334 BLAKE2B bebd372120c38577ad3a21f99cfb6989fdda774975622e6b3699a73505fc1e350cb76188d0c173bbd0bf94bfc787916c1732cdc2a7998322d8d15aba85dc16f8 SHA512 c49f4f3c3c917a12887872373ea0f817c12ba780d1da6c65edfcf8b7ffdef45d35d1b3f186bd36d7684f8ba30fe034b512fcae42b5adc8c4e5dec2e9d8685a01 +AUX matplotlib-3.10.3-test.patch 10206 BLAKE2B 8533f3f3418530496deca9bc1053676f62b73a413ef391f7416200db24a430dae16abf2f747a36243ccee101edcae57368938a4a32095924b9eadee7f428b2af SHA512 c6863bf234368400c88cfca2dbff122a911a96956232d89a8b03ddf3112e1a8c6393262dd598a8223b60fdba0ab7ee2701e3c37558ab571e8205e79d2155c415 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b DIST matplotlib-3.10.1.tar.gz 36743335 BLAKE2B e689dcaa314a6af8ce2934aac95208adf0f87822e4f84d6fb15ac1a17d162deea106636abf52b5332636ad8bb944301f16100b15d409b04ef2a8ecd287ea827c SHA512 1b52a421e61ca0a295d7b1d2bbe9bdcb1dd58f6c750b21d95e263547b20a17d58aadcc86f97ae0fdff9151d3c2f75a6c5419a35b258b698d777f42de7b598c4e -DIST matplotlib-3.9.0.tar.gz 36069890 BLAKE2B 02ddb25901b5a93a8daf6f26c98b92d5e35abe2e98783b039928338abb1d628adbf3fd4786c08cb1610bf405cb558ca31fc12dbde77ec5f2a633143c7ea659a1 SHA512 135ee2f97c26cb60479cc10bf8a833384c393993d8a905ab869f4c73b91a50ffa596f84ce349af7f1a0b08a21e1906394cf6a702bb567a9c3999d40f54974326 -EBUILD matplotlib-3.10.1.ebuild 11001 BLAKE2B b0a141d368f8dca75a051205ede4987bfb5a5dfbe5e136b3a053ac823b6ce5b2d0052095b254b12257889c88a2569cc992ba7197c3d79f78250e427de138613c SHA512 6e48708586605c0e25332fc0790dd96f8fc1fdf744161e85e4165b240ae9f21833c6ce0eead3a93122cda0f2734492ad3a652efc97c2d853129b455adfde9263 -EBUILD matplotlib-3.9.0-r1.ebuild 9776 BLAKE2B 9f05ba95f89bb02c04d3338ca750b4b404a531e78c287208b7ecd9f04525adc23593c3b9f5e981d5e23357bf236d6487185cff354e7c80825d1342ff4720ec37 SHA512 120ae193b6b9b16dcd554cd818b52a80f529c6e72e7b67752707fc70407d6b7dc18908ab01ce81ee6d192063dd8bbd4165e17da76200310b74ff9df5ecced82e +DIST matplotlib-3.10.3.tar.gz 34799811 BLAKE2B f855a65ebf6d33373b8ed62fca0824291aa10319cfa652e0ed07db4fe2511d6bc0232e0ef44858717142ce6f13ef604131c312d3ffa00b414321d34dc45d2727 SHA512 c3027fa116f45a4a7d7ac8e7ce87f509a6604b283c39b74379e8d84a05df61283ddf4e79036c9b83b2dff13291b59945d26aeb7420873d3b275097817a12be72 +EBUILD matplotlib-3.10.1.ebuild 11065 BLAKE2B 8b61a3f312c52a8311826429dfeb308e36c4402d29ab353128429a62a2b81f09f6c83d0dc9d05a2cd27428daafa9d7b920527df428f862947ae6bc126f8472bd SHA512 04c4a370ef1d5170f212049da33f0a8e2d539d45f235b44413285de63a6008fcf746d8f4cfc6d44aff5e62ee85369e45dd117518a0c0db4908b1b314c526af45 +EBUILD matplotlib-3.10.3.ebuild 11279 BLAKE2B ae5beb05cfa43c1dfd3e389e313ac5d5c6f391b7f9bdb54d72641c582f73a1514ee4de0fa83a40baa8c3269ea15d0c95262352005733362e09dc54b1ad507707 SHA512 3076897e85981e47f7fee30ef482615fc6e0738f5b577345f6ceff29bf0075afb36f078574ea1d4438cd0fb4a074ba9c62d49df3a28e67c0ab67e2ccc9c07964 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704 diff --git a/dev-python/matplotlib/files/matplotlib-3.10.3-test.patch b/dev-python/matplotlib/files/matplotlib-3.10.3-test.patch new file mode 100644 index 000000000000..b58b0c5bca41 --- /dev/null +++ b/dev-python/matplotlib/files/matplotlib-3.10.3-test.patch @@ -0,0 +1,246 @@ +From 54ef285784b7519dfbe4170662d09518b237c7d5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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 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(): + + + @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 e3fc1ada99..1c387ef2df 100644 +--- a/lib/matplotlib/tests/test_axes.py ++++ b/lib/matplotlib/tests/test_axes.py +@@ -1214,7 +1214,7 @@ def test_imshow(): + + + @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 + # use former defaults to match existing baseline image +@@ -2648,7 +2648,7 @@ def test_contour_hatching(): + + + @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() + +@@ -5176,7 +5176,7 @@ def test_vertex_markers(): + + + @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)) + +@@ -9161,7 +9161,7 @@ def test_zorder_and_explicit_rasterization(): + + + @image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20", +- 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 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 7c7dd43a31..fd64eced4b 100644 +--- a/lib/matplotlib/tests/test_constrainedlayout.py ++++ b/lib/matplotlib/tests/test_constrainedlayout.py +@@ -200,7 +200,7 @@ def test_constrained_layout9(): + + + @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 543cff18c6..6e113bc897 100644 +--- a/lib/matplotlib/tests/test_contour.py ++++ b/lib/matplotlib/tests/test_contour.py +@@ -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(): +diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py +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 + + + @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 5e69044866..1480f7c663 100644 +--- a/lib/matplotlib/tests/test_legend.py ++++ b/lib/matplotlib/tests/test_legend.py +@@ -165,7 +165,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) +@@ -174,7 +174,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) +@@ -202,7 +202,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 81252198cd..dd62412b44 100644 +--- a/lib/matplotlib/tests/test_lines.py ++++ b/lib/matplotlib/tests/test_lines.py +@@ -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) + 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 cc71f68585..1fd3b50fea 100644 +--- a/lib/matplotlib/tests/test_units.py ++++ b/lib/matplotlib/tests/test_units.py +@@ -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', +- 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 +@@ -108,7 +108,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 + + ++@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 + diff --git a/dev-python/matplotlib/files/matplotlib-3.9.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.9.0-test.patch deleted file mode 100644 index db8ab5e2a0fb..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.9.0-test.patch +++ /dev/null @@ -1,249 +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 0ed5a11c13..c57ed9934e 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -1157,7 +1157,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 - # use former defaults to match existing baseline image -@@ -2541,7 +2541,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() - -@@ -4902,7 +4902,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)) - -@@ -8810,7 +8810,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 35911afc79..852075c78d 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 4dc4d9501e..015e46cbe4 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) - - - @pytest.mark.parametrize('arg, state', [ -diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py -index d4600a14fe..d2deff9362 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) - # 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 58aecd3dea..53f3145cbd 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_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 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -177,7 +177,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) -@@ -186,7 +186,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) -@@ -214,7 +214,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 531237b2ba..0e37450e1a 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 ae6372fea1..4f0dc25732 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 - - -+@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 - diff --git a/dev-python/matplotlib/matplotlib-3.10.1.ebuild b/dev-python/matplotlib/matplotlib-3.10.1.ebuild index 0a100958d2a9..9a6ab19693e1 100644 --- a/dev-python/matplotlib/matplotlib-3.10.1.ebuild +++ b/dev-python/matplotlib/matplotlib-3.10.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) +PYTHON_COMPAT=( pypy3_11 python3_{11..13} ) PYTHON_REQ_USE='tk?,threads(+)' inherit distutils-r1 pypi virtualx @@ -29,7 +29,7 @@ SRC_URI+=" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets" DEPEND=" @@ -293,6 +293,7 @@ python_test() { ) distutils_pep517_install "${BUILD_DIR}"/test cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die + cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/pyvenv.cfg" || die local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH} pushd lib >/dev/null || die diff --git a/dev-python/matplotlib/matplotlib-3.10.3.ebuild b/dev-python/matplotlib/matplotlib-3.10.3.ebuild new file mode 100644 index 000000000000..cffdac6e6b4c --- /dev/null +++ b/dev-python/matplotlib/matplotlib-3.10.3.ebuild @@ -0,0 +1,328 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=meson-python +PYTHON_COMPAT=( pypy3_11 python3_{11..13} ) +PYTHON_REQ_USE='tk?,threads(+)' + +inherit distutils-r1 pypi virtualx + +FT_PV=2.6.1 +DESCRIPTION="Pure python plotting library with matlab like syntax" +HOMEPAGE=" + https://matplotlib.org/ + https://github.com/matplotlib/matplotlib/ + https://pypi.org/project/matplotlib/ +" +SRC_URI+=" + test? ( + https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz + ) +" + +# Main license: matplotlib +# Some modules: BSD +# matplotlib/backends/qt4_editor: MIT +# Fonts: BitstreamVera, OFL-1.1 +LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets" + +DEPEND=" + media-libs/freetype:2 + >=media-libs/qhull-2013:= + >=dev-python/numpy-1.25:=[${PYTHON_USEDEP}] +" +# internal copy of pycxx highly patched +# dev-python/pycxx +RDEPEND=" + ${DEPEND} + >=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}] + >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] + >=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}] + >=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}] + >=dev-python/packaging-20.0[${PYTHON_USEDEP}] + >=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}] + >=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}] + >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] + media-fonts/dejavu + media-fonts/stix-fonts + media-libs/libpng:0 + virtual/imagemagick-tools[jpeg,tiff] + cairo? ( + dev-python/cairocffi[${PYTHON_USEDEP}] + ) + excel? ( + dev-python/xlwt[${PYTHON_USEDEP}] + ) + gtk3? ( + >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] + ) + latex? ( + virtual/latex-base + app-text/dvipng + app-text/ghostscript-gpl + app-text/poppler[utils] + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-latexextra + dev-texlive/texlive-luatex + dev-texlive/texlive-xetex + ) + qt6? ( + $(python_gen_cond_dep ' + || ( + dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyside:6[gui,widgets,${PYTHON_USEDEP}] + ) + ' 'python3*') + ) + webagg? ( + >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] + ) + wxwidgets? ( + $(python_gen_cond_dep ' + dev-python/wxpython:*[${PYTHON_USEDEP}] + ' python3_{10..12}) + ) +" + +BDEPEND=" + ${RDEPEND} + dev-python/pybind11[${PYTHON_USEDEP}] + >=dev-python/setuptools-scm-7[${PYTHON_USEDEP}] + virtual/pkgconfig + test? ( + $(python_gen_impl_dep 'tk') + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] + >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] + !hppa? ( !s390? ( + || ( + media-video/ffmpeg[openh264] + media-video/ffmpeg[x264] + ) + ) ) + gtk3? ( + >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] + ) + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_unpack() { + # do not unpack freetype + unpack "${P//_/}.tar.gz" +} + +python_prepare_all() { + # Affects installed _version.py, bug #854600 + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + + local PATCHES=( + "${FILESDIR}"/matplotlib-3.10.3-test.patch + ) + + # increase lock timeout to 30 s + sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die + + distutils-r1_python_prepare_all +} + +src_configure() { + unset DISPLAY # bug #278524 + export XDG_RUNTIME_DIR="${T}/runtime-dir" + mkdir "${XDG_RUNTIME_DIR}" || die + chmod 0700 "${XDG_RUNTIME_DIR}" || die + + DISTUTILS_ARGS=( + -Dsystem-freetype=true + -Dsystem-qhull=true + -Dmacosx=false + ) +} + +src_test() { + mkdir subprojects/packagecache || die + cp "${DISTDIR}/freetype-${FT_PV}.tar.gz" subprojects/packagecache/ || die + virtx distutils-r1_src_test +} + +python_test() { + local EPYTEST_DESELECT=( + # broken by -Wdefault + "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]" + "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]" + tests/test_testing.py::test_warn_to_fail + tests/test_legend.py::test_legend_nolabels_warning + # TODO? + tests/test_backend_qt.py::test_fig_sigint_override + tests/test_backend_qt.py::test_ipython + tests/test_backend_nbagg.py::test_ipynb + # leak tests are fragile + tests/test_backends_interactive.py::test_figure_leak_20490 + # major "images not close", new texlive perhaps + tests/test_contour.py::test_all_algorithms + # "no warnings" + tests/test_backend_pdf.py::test_invalid_metadata + tests/test_figure.py::test_too_many_figures + # Requires qt5 + tests/test_backends_interactive.py::test_qt5backends_uses_qt5 + 'tests/test_backends_interactive.py::test_interactive_backend[toolbar2-MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]' + 'tests/test_backends_interactive.py::test_interactive_backend[toolbar2-MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]' + 'tests/test_backends_interactive.py::test_interactive_backend[toolmanager-MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]' + 'tests/test_backends_interactive.py::test_blitting_events[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]' + 'tests/test_backends_interactive.py::test_blitting_events[MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]' + 'tests/test_backends_interactive.py::test_interactive_thread_safety[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]' + 'tests/test_backends_interactive.py::test_interactive_timers[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]' + 'tests/test_backends_interactive.py::test_interactive_timers[MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]' + # Tests mixing qt5 and qt6, requires installing all Qt4Py impl. + tests/test_backends_interactive.py::test_cross_Qt_imports + ) + + case ${EPYTHON} in + pypy3) + EPYTEST_DESELECT+=( + # TODO + tests/test_widgets.py::test_check_buttons + tests/test_widgets.py::test_check_buttons_lines + tests/test_widgets.py::test_check_radio_buttons_image + tests/test_widgets.py::test_radio_buttons + ) + ;& + pypy3.11) + EPYTEST_DESELECT+=( + # TODO: warning isn't passed through + tests/test_image.py::test_large_image + # TODO: regression in 7.3.18+ + tests/test_axes.py::test_axes_clear_reference_cycle + # TODO + tests/test_pickle.py::test_complete + tests/test_pickle.py::test_no_pyplot + tests/test_pickle.py::test_pickle_load_from_subprocess + tests/test_pickle.py::test_simple + tests/test_texmanager.py::test_openin_any_paranoid + ) + ;; + python3.11) + EPYTEST_DESELECT+=( + # https://github.com/matplotlib/matplotlib/issues/23384 + "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]" + "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]" + ) + ;; + python3.12) + EPYTEST_DESELECT+=( + tests/test_constrainedlayout.py::test_compressed1 + ) + ;; + esac + + case ${ABI} in + hppa) + EPYTEST_DESELECT+=( + 'tests/test_mathtext.py::test_mathtext_exceptions[hspace without value]' + 'tests/test_mathtext.py::test_mathtext_exceptions[hspace with invalid value]' + 'tests/test_mathtext.py::test_mathtext_exceptions[function without space]' + 'tests/test_mathtext.py::test_mathtext_exceptions[accent without space]' + 'tests/test_mathtext.py::test_mathtext_exceptions[frac without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[frac with empty parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[binom without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[binom with empty parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[genfrac without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[genfrac with empty parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[sqrt without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[sqrt with invalid value]' + 'tests/test_mathtext.py::test_mathtext_exceptions[overline without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[overline with empty parameter]' + 'tests/test_mathtext.py::test_mathtext_exceptions[left with invalid delimiter]' + 'tests/test_mathtext.py::test_mathtext_exceptions[right with invalid delimiter]' + 'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses with sizing]' + 'tests/test_mathtext.py::test_mathtext_exceptions[unclosed parentheses without sizing]' + 'tests/test_mathtext.py::test_mathtext_exceptions[dfrac without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[dfrac with empty parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[overset without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[underset without parameters]' + 'tests/test_mathtext.py::test_mathtext_exceptions[unknown symbol]' + 'tests/test_mathtext.py::test_mathtext_exceptions[double superscript]' + 'tests/test_mathtext.py::test_mathtext_exceptions[double subscript]' + 'tests/test_mathtext.py::test_mathtext_exceptions[super on sub without braces]' + 'tests/test_quiver.py::test_barbs[png]' + 'tests/test_quiver.py::test_barbs_pivot[png]' + 'tests/test_quiver.py::test_barbs_flip[png]' + 'tests/test_text.py::test_parse_math' + 'tests/test_text.py::test_parse_math_rcparams' + ) + ;; + arm) + EPYTEST_DESELECT+=( + tests/test_backend_ps.py::test_savefig_to_stringio + # too large for 32-bit platforms + 'tests/test_axes.py::test_psd_csd[png]' + ) + ;; + sparc64) + EPYTEST_DESELECT+=( + tests/test_backend_pgf.py::test_pdf_pages_metadata_check + tests/test_backend_pgf.py::test_minus_signs_with_tex + ) + ;; + alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86) + EPYTEST_DESELECT+=( + # too large for 32-bit platforms + 'tests/test_axes.py::test_psd_csd[png]' + ) + ;; + *) + ;; + esac + + # override BUILD_DIR used by meson, so that mpl is actually rebuilt + # against bundled freetype + local orig_build_dir=${BUILD_DIR} + local BUILD_DIR=${BUILD_DIR}-test + + # we need to rebuild mpl against bundled freetype, otherwise + # over 1000 tests will fail because of mismatched font rendering + local DISTUTILS_ARGS=( + "${DISTUTILS_ARGS[@]}" + -Dsystem-freetype=false + ) + distutils_pep517_install "${BUILD_DIR}"/install + cp -r {"${orig_build_dir}","${BUILD_DIR}"}/install"${EPREFIX}/usr/bin" || die + cp -r {"${orig_build_dir}","${BUILD_DIR}"}/install"${EPREFIX}/usr/pyvenv.cfg" || die + local -x PATH=${BUILD_DIR}/install${EPREFIX}/usr/bin:${PATH} + + pushd lib >/dev/null || die + local path + local sitedir=${BUILD_DIR}/install$(python_get_sitedir) + # sigh, upstream doesn't install these + while IFS= read -d '' path; do + cp -r "${path}" "${sitedir}/${path}" || die + done < <( + find \( \ + -name baseline_images -o \ + -name '*.ipynb' -o \ + -name '*.pfb' -o \ + -name '*.ttf' -o \ + -name tinypages \ + \) -print0 + ) + popd >/dev/null || die + + # speed tests up + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + # pretend we're on CI to increase timeouts + local -x CI=1 + nonfatal epytest --pyargs matplotlib -m "not network" \ + -p rerunfailures --reruns=3 \ + -o tmp_path_retention_policy=all || die +} diff --git a/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild deleted file mode 100644 index 46d973372268..000000000000 --- a/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( pypy3 python3_{10..13} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 pypi virtualx - -FT_PV=2.6.1 -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE=" - https://matplotlib.org/ - https://github.com/matplotlib/matplotlib/ - https://pypi.org/project/matplotlib/ -" -SRC_URI+=" - test? ( - https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz - ) -" - -# Main license: matplotlib -# Some modules: BSD -# matplotlib/backends/qt4_editor: MIT -# Fonts: BitstreamVera, OFL-1.1 -LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets" - -DEPEND=" - media-libs/freetype:2 - >=media-libs/qhull-2013:= - >=dev-python/numpy-1.25:=[${PYTHON_USEDEP}] -" -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - ${DEPEND} - >=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}] - >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] - >=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}] - >=dev-python/kiwisolver-1.3.1[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-8[jpeg,webp,${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - media-fonts/dejavu - media-fonts/stix-fonts - media-libs/libpng:0 - virtual/imagemagick-tools[jpeg,tiff] - cairo? ( - dev-python/cairocffi[${PYTHON_USEDEP}] - ) - excel? ( - dev-python/xlwt[${PYTHON_USEDEP}] - ) - gtk3? ( - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - latex? ( - virtual/latex-base - app-text/dvipng - app-text/ghostscript-gpl - app-text/poppler[utils] - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-luatex - dev-texlive/texlive-xetex - ) - qt5? ( - $(python_gen_cond_dep ' - dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}] - ' 'python3*') - ) - webagg? ( - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{10..12}) - ) -" - -BDEPEND=" - ${RDEPEND} - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/setuptools-scm-7[${PYTHON_USEDEP}] - virtual/pkgconfig - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - !hppa? ( !s390? ( - || ( - media-video/ffmpeg[openh264] - media-video/ffmpeg[x264] - ) - ) ) - gtk3? ( - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_unpack() { - # do not unpack freetype - unpack "${P}.tar.gz" -} - -python_prepare_all() { - # Affects installed _version.py, bug #854600 - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - - local PATCHES=( - "${FILESDIR}"/matplotlib-3.9.0-test.patch - ) - - # increase lock timeout to 30 s - sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die - - distutils-r1_python_prepare_all -} - -src_configure() { - unset DISPLAY # bug #278524 - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - DISTUTILS_ARGS=( - -Dsystem-freetype=true - -Dsystem-qhull=true - -Dmacosx=false - ) -} - -src_test() { - mkdir subprojects/packagecache || die - cp "${DISTDIR}/freetype-${FT_PV}.tar.gz" subprojects/packagecache/ || die - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # broken by -Wdefault - "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]" - "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]" - tests/test_testing.py::test_warn_to_fail - tests/test_legend.py::test_legend_nolabels_warning - # TODO? - tests/test_backend_qt.py::test_fig_sigint_override - tests/test_backend_qt.py::test_ipython - tests/test_backend_nbagg.py::test_ipynb - # leak tests are fragile - tests/test_backends_interactive.py::test_figure_leak_20490 - # major "images not close", new texlive perhaps - tests/test_contour.py::test_all_algorithms - # "no warnings" - tests/test_backend_pdf.py::test_invalid_metadata - tests/test_figure.py::test_too_many_figures - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # TODO: warning isn't passed through - tests/test_image.py::test_large_image - # TODO - tests/test_pickle.py::test_complete - tests/test_pickle.py::test_no_pyplot - tests/test_pickle.py::test_pickle_load_from_subprocess - tests/test_pickle.py::test_simple - tests/test_texmanager.py::test_openin_any_paranoid - tests/test_widgets.py::test_check_buttons - tests/test_widgets.py::test_check_buttons_lines - tests/test_widgets.py::test_check_radio_buttons_image - tests/test_widgets.py::test_radio_buttons - ) - if has_version "/dev/null || die - local path - local sitedir=${BUILD_DIR}/test$(python_get_sitedir) - # sigh, upstream doesn't install these - while IFS= read -d '' path; do - cp -r "${path}" "${sitedir}/${path}" || die - done < <( - find \( \ - -name baseline_images -o \ - -name '*.ipynb' -o \ - -name '*.pfb' -o \ - -name '*.ttf' -o \ - -name tinypages \ - \) -print0 - ) - popd >/dev/null || die - - # speed tests up - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # pretend we're on CI to increase timeouts - local -x CI=1 - nonfatal epytest --pyargs matplotlib -m "not network" \ - -p rerunfailures --reruns=3 \ - -o tmp_path_retention_policy=all || die -} -- cgit v1.2.3