From 37bccfe5e76c5740c4ef5ba1179e9488d8404075 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Jul 2024 12:25:39 +0100 Subject: gentoo auto-resync : 12:07:2024 - 12:25:38 --- dev-python/matplotlib/Manifest | 4 - .../files/matplotlib-3.3.3-disable-lto.patch | 25 -- .../matplotlib/files/matplotlib-3.8.0-test.patch | 263 -------------- dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild | 380 --------------------- 4 files changed, 672 deletions(-) delete mode 100644 dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch delete mode 100644 dev-python/matplotlib/files/matplotlib-3.8.0-test.patch delete mode 100644 dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild (limited to 'dev-python/matplotlib') diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 1c5e7ee522df..ac4d6363ea05 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,11 +1,7 @@ -AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed -AUX matplotlib-3.8.0-test.patch 10695 BLAKE2B cbe1268c0b6a7765eb0ae70fb0268ca37ec87751d32b4646f96496c3b2c80c3bd344df5a02cb7edd87621cadd956d79fc6f88d342e7a68ae17b53571dc332ce0 SHA512 17a956b5c6b971adafa1fa7d07baca09cb730fdda49910a466b0097ac6106a2bc5e572488358596ae2e9db98bf860b71f983daf24421c2c418306b4bd4e58c4b AUX matplotlib-3.9.0-test.patch 10334 BLAKE2B bebd372120c38577ad3a21f99cfb6989fdda774975622e6b3699a73505fc1e350cb76188d0c173bbd0bf94bfc787916c1732cdc2a7998322d8d15aba85dc16f8 SHA512 c49f4f3c3c917a12887872373ea0f817c12ba780d1da6c65edfcf8b7ffdef45d35d1b3f186bd36d7684f8ba30fe034b512fcae42b5adc8c4e5dec2e9d8685a01 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b -DIST matplotlib-3.8.4.tar.gz 35934425 BLAKE2B e449f1d71a3152a9cf34cf13c70489d2664c8734c8e8ae0ed5dec2ed5111e0210d679f7e6a1e0b707499d9968b945a7f91573186b82c6d036238aadb5c9da006 SHA512 d4c6a5b3484927dbae1b1203e9984b67d08c958c4a5136abaa805f1eb221146fb1211e5f20456e281d41fc09c94917a796ffacfdb185c58eeeb6d19e60c78b1a DIST matplotlib-3.9.0.tar.gz 36069890 BLAKE2B 02ddb25901b5a93a8daf6f26c98b92d5e35abe2e98783b039928338abb1d628adbf3fd4786c08cb1610bf405cb558ca31fc12dbde77ec5f2a633143c7ea659a1 SHA512 135ee2f97c26cb60479cc10bf8a833384c393993d8a905ab869f4c73b91a50ffa596f84ce349af7f1a0b08a21e1906394cf6a702bb567a9c3999d40f54974326 DIST matplotlib-3.9.1.tar.gz 36084124 BLAKE2B b7cc9e219664849411cc3133afbdb676f956c943f92d447ba5cca0467da56d1575796fe1046e7503e6d7c4dfdfad6e5181404f331ed7ac1397c8c61f4a30bd23 SHA512 a1d48c42a5f4f04b57e34d25df842917e6380b8d6b6d1018c9b630cbbea4619b1d75729a218a6f52b63d4a61c2204bb26ad8f741566f84e41ca73190e419f672 -EBUILD matplotlib-3.8.4-r1.ebuild 11560 BLAKE2B c1f8c41400984468133651b742d43ab71bc59ad989f352f62dbcac28770c8028664f28d0380244e1349594c32a226732d3c9f93b72fdbce0eef6c1e63d576d84 SHA512 827a03eecb5db47149de4b781aeaeaba4278e557f2c91b6f2551462e3c8f65a2b3ac41f274be8e16a458ffc65723e6643fa9779672e613a6141d2b618d44f054 EBUILD matplotlib-3.9.0-r1.ebuild 9782 BLAKE2B 354b9be0795336984ffcf39de8a842e9e684e75f568af0d9244226e14228ae79b7928d43a476476a5ec3f086c4fb987f4861c9d6b70960ddb3b1882ef1899ac7 SHA512 f420f8f1002d2a4916b2208fca43384912acaf93721353759911981f91c8135bebc7012418a04ef6c89dae513224b9f1af92ae49972c7f9a0dc15c283eef1882 EBUILD matplotlib-3.9.1.ebuild 9819 BLAKE2B a28dc58e6c1af4b8b710f57c2bf72029e5f0351095cf595e84fe8327a75afc9f630ff74a4f02eebffbe9bb557a7c2100691c93420ddb880166c9661fb3fa6de5 SHA512 b084d5b52347987cc90df50f2bf3114ace05ffa08b251efeb871a3904e11336a32d7ab9185b148ea130341410a86b1c9e3a5a5e2b8e9abe4ff7dba1d7e90d7ef MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704 diff --git a/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch b/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch deleted file mode 100644 index ab377e7f19b2..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7382d6205bfdc647a8e47c8e417c991d3822eace Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 4 Jan 2021 10:03:32 +0100 -Subject: [PATCH] Disable -flto - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 6e1d19d..ed85d14 100644 ---- a/setup.py -+++ b/setup.py -@@ -147,7 +147,7 @@ class BuildExtraLibraries(BuildExtCommand): - ranlib = True - else: - ranlib = shutil.which('llvm-ranlib') -- if ranlib and has_flag(self.compiler, '-flto'): -+ if False and ranlib and has_flag(self.compiler, '-flto'): - for ext in self.extensions: - ext.extra_compile_args.append('-flto') - cppflags.append('-flto') --- -2.30.0 - 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?= -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 - # 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 - diff --git a/dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild b/dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild deleted file mode 100644 index cc7b4764a854..000000000000 --- a/dev-python/matplotlib/matplotlib-3.8.4-r1.ebuild +++ /dev/null @@ -1,380 +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=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic prefix pypi toolchain-funcs 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 ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="cairo doc excel gtk3 latex qt5 tk webagg wxwidgets" - -DEPEND=" - >=dev-python/numpy-1.25:=[${PYTHON_USEDEP}] - media-libs/freetype:2 - >=media-libs/qhull-2013:= -" -# 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..11}) - ) -" - -BDEPEND=" - ${RDEPEND} - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/setuptools-scm-7[${PYTHON_USEDEP}] - virtual/pkgconfig - doc? ( - >=app-text/dvipng-1.15-r1 - >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}] - >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}] - >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}] - >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}] - >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}] - virtual/latex-base - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-luatex - dev-texlive/texlive-xetex - >=media-gfx/graphviz-2.42.3[cairo] - ) - 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 - -use_setup() { - local uword="${2:-${1}}" - if use "${1}"; then - echo "${uword} = True" - echo "${uword}agg = True" - else - echo "${uword} = False" - echo "${uword}agg = False" - fi -} - -python_prepare_all() { -# Generates test failures, but fedora does it -# local PATCHES=( -# "${FILESDIR}"/${P}-unbundle-pycxx.patch -# "${FILESDIR}"/${P}-unbundle-agg.patch -# ) -# rm -r agg24 CXX || die -# rm -r agg24 || die - - # Affects installed _version.py, bug #854600 - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} - - local PATCHES=( - "${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch - "${FILESDIR}"/matplotlib-3.8.0-test.patch - ) - - # increase lock timeout to 30 s - sed -i -e 's:retries = 50:retries = 300:' lib/matplotlib/cbook.py || die - - hprefixify setupext.py - - rm -rf libqhull || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - append-cppflags -DNDEBUG # or get old trying to do triangulation - tc-export PKG_CONFIG - - unset DISPLAY # bug #278524 - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die -} - -python_configure() { - mkdir -p "${BUILD_DIR}" || die - - # create setup.cfg (see setup.cfg.template for any changes). - - # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die - [directories] - basedirlist = ${EPREFIX}/usr - [provide_packages] - pytz = False - dateutil = False - [libs] - system_freetype = True - system_qhull = True - [packages] - tests = True - [gui_support] - agg = True - gtk = False - gtkagg = False - macosx = False - pyside = False - pysideagg = False - qt4 = False - qt4agg = False - $(use_setup cairo) - $(use_setup gtk3) - $(use_setup qt5) - $(use_setup tk) - $(use_setup wxwidgets wx) - EOF - - if use gtk3 && use cairo; then - echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die - else - echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die - fi -} - -wrap_setup() { - local MAKEOPTS=-j1 - local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg - "$@" -} - -python_compile() { - wrap_setup distutils-r1_python_compile - find "${BUILD_DIR}" -name '*.pth' -delete || die -} - -python_compile_all() { - if use doc; then - cd doc || die - - VARTEXFONTS="${T}"/fonts \ - emake SPHINXOPTS= O=-Dplot_formats=png:100 html - fi -} - -src_test() { - mkdir build || die - ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || 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 - # TODO? - tests/test_backend_qt.py::test_fig_sigint_override - # 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 " "${BUILD_DIR}"/test-setup.cfg || die - local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg - - esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib - local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH} - - # 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 -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all -} -- cgit v1.2.3