diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-04-21 12:57:06 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-04-21 12:57:06 +0000 |
| commit | 47ec56ceecb885e965ff76961f9628f7e8240ec4 (patch) | |
| tree | 48b6799fb6bdb5e5b079177104d70aa5ec8959d2 /dev-python | |
| parent | 966fd084f5013122fca36e02270e600751398bc4 (diff) | |
| download | baldeagleos-repo-47ec56ceecb885e965ff76961f9628f7e8240ec4.tar.gz baldeagleos-repo-47ec56ceecb885e965ff76961f9628f7e8240ec4.tar.xz baldeagleos-repo-47ec56ceecb885e965ff76961f9628f7e8240ec4.zip | |
Adding metadata
Diffstat (limited to 'dev-python')
33 files changed, 544 insertions, 2095 deletions
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index b4d252ecb006..0c72e0c46b17 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -5,3 +5,4 @@ DIST boto3-1.26.113.gh.tar.gz 636722 BLAKE2B 0b5c3819c004ba425294208f114b4b11713 DIST boto3-1.26.114.gh.tar.gz 637000 BLAKE2B 06f74ac214f4c2161ebe464e1c8fc42c74cb4429110c8ce979db3962fde5240c62ac94b4b9ca002fff89a36659a8830265ac693bd9522082b8cae21108e16cf9 SHA512 324ea177c8ee98a0935d1935f08b31f1640eedf8a7dd19f2bc958f6c1c2fb9deea29f0482b1f4c903d70860a93274dd0d70eafe0564116361daf5e7df51abd26 DIST boto3-1.26.115.gh.tar.gz 637877 BLAKE2B 861cf3a197002bcfac3f1ca3428bd01f1a8e103462e0de83ed33bb7575de0056f4222195c70dcd0e40dcf3744467e8c017bfe361e589eaf641fec76d6d3eea94 SHA512 337e90d91bb9efcff89b410d5222dead7ce1d0f35257bebe0309cd5fa657facd1a0352bee0ea23d3b94ad852da03a182b7dabf4c2d854390fd227bd58fabc6d3 DIST boto3-1.26.116.gh.tar.gz 638605 BLAKE2B 946634bfaa4f0b4bd3689a11d8dc3e982dd8166c2b4409335bd1be58c356bbcbf2e5d22c7f319d29a549c69d4a14a3d2afb369c345c643cfa369fb3c9843e04f SHA512 2434fbf7ef2434365863ae8c67c16209a6537afb21697e24efd466146f6fe03566bec220943392139231d55aa570ba3d696a086fc087e4f9d1908da96794c77a +DIST boto3-1.26.117.gh.tar.gz 639473 BLAKE2B fcb41a6f91de9f64778dcbdd9fe4cdf1f4e9aa57eb0b18f8712befd7e4e1ff7c54241b60ebe784ff25d0b61f8db5b00da0827b23bb64ef82487af859425e99f3 SHA512 a52fb6567f2407b862d0059510f47e9551236c867bc3bc8bc1b9a9e132188505efd6fc060cb32806478fe886dd9293141131df099df25a4c53bc405d729fad08 diff --git a/dev-python/boto3/boto3-1.26.117.ebuild b/dev-python/boto3/boto3-1.26.117.ebuild new file mode 100644 index 000000000000..2a4a7643203e --- /dev/null +++ b/dev-python/boto3/boto3-1.26.117.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 multiprocessing + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE=" + https://github.com/boto/boto3/ + https://pypi.org/project/boto3/ +" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI=" + https://github.com/boto/boto3/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + + distutils-r1_python_prepare_all +} + +python_test() { + epytest tests/{functional,unit} -n "$(makeopts_jobs)" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 6fa721da61cc..d27080da2313 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -5,3 +5,4 @@ DIST botocore-1.29.113.gh.tar.gz 11386284 BLAKE2B a3611f356f25080f00f675b20a8b49 DIST botocore-1.29.114.gh.tar.gz 11388772 BLAKE2B 6c9ce892cccf2f85ba4bcd49b31309528016313bb699efbca3b00d3cf3797de5e1b35bd71a3b5bd6d471e9c411ad7750ebd25c03571aa18c34cd42bc2f47bc19 SHA512 6633a2aaf2865a89976ba4097fa64cee4167a9144d4eadc7d9be711e65735bab08d2c03c18ae52c4901fea47265301cb95c91306b261fb48b4119bec66cde376 DIST botocore-1.29.115.gh.tar.gz 11394187 BLAKE2B 621be4a22b7f06d520bcd630ed6e1a8721d11d5c7822f56f54907177d0773b69247b627a42cfbb1b8e053f54ea16f7238acc0d485379c1e071b6e917ea625596 SHA512 525d8f219cad541c4cc125c2d5eeb7595fba6192bda23e7bcc02a65e4ec413756ae3d8ab5bcb3185b5c837bc7214c22146e52716ff010cc396bc8d32cd98b956 DIST botocore-1.29.116.gh.tar.gz 11399292 BLAKE2B 47a53b2612804911465f6f56a78f79e389ac7bd2e29e3f45c60f25ec1e700df8956dac034d058974bb453623d5ed5edc416d07b45427cb1ef3c584b5ec4b97f3 SHA512 81636c104a0c4b4f04ebeb066171be206929d5eaf2c40e6f383e701a9dc917f84d4b2f9ef2d7a26b278960af7561316d289be4150eede9a56be20dbf606aa57c +DIST botocore-1.29.117.gh.tar.gz 11408322 BLAKE2B f7b364805f6604abe8dff06015b68867dd1f0385bfa1f52a8f0f041387c28a29cc9ee54932841736db5abd3c39b6cce4c6f4aaa5d45f12483fa9064a98718bcf SHA512 b9eb2fd8650fc4baa465da4e559b83766c5d677121df541693a28602b6a780ea9a1177b92d758cb5e6524d01e8d345461b1c4a35987dfafd9441d9a4aa50c927 diff --git a/dev-python/botocore/botocore-1.29.117.ebuild b/dev-python/botocore/botocore-1.29.117.ebuild new file mode 100644 index 000000000000..491b6bbc21f2 --- /dev/null +++ b/dev-python/botocore/botocore-1.29.117.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 multiprocessing + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE=" + https://github.com/boto/botocore/ + https://pypi.org/project/botocore/ +" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI=" + https://github.com/boto/botocore/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + <dev-python/jmespath-2[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + + # unbundle deps + rm -r botocore/vendored || die + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + + distutils-r1_src_prepare +} + +python_test() { + local EPYTEST_DESELECT=( + # rely on bundled six + tests/functional/test_six_imports.py::test_no_bare_six_imports + tests/functional/test_six_threading.py::test_six_thread_safety + # fails on unrelated warnings + tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME + tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME + # TODO + tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider + ) + + epytest tests/{functional,unit} -n "$(makeopts_jobs)" +} diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest index 19a65f8729f1..fc8edc04a472 100644 --- a/dev-python/ensurepip-setuptools/Manifest +++ b/dev-python/ensurepip-setuptools/Manifest @@ -1 +1,2 @@ DIST setuptools-67.6.1-py3-none-any.whl 1089263 BLAKE2B fe1ca817d2743e5edefac47230aa2cb5f4e75945bcdb821ca2d61011a419653d8b0880d846e11e4450cb19fd22fcd45d570b6c33fce640a8515df6e65f7a1662 SHA512 ad7a81c60b2b3f190561178531123a0e2d278c4cd9615930d5b0276fc79bea390f1cc92ab37061378ebee09fc36c21440a4db00f20029093570b7006cd14b25b +DIST setuptools-67.7.0-py3-none-any.whl 1093434 BLAKE2B 76e91b7353f75f4c2c3eaa0222b1e846c82fb24a7c7220408cc3f547d8243bc0e306b19661f26e5bd5b2a82b3f8e58c60b3906869011477fbc2db82152baeb94 SHA512 22428cf43932d4a16f704adace5e6fa9ddff15c2715c9ba2c0f47c2e96d5fa95e5fbd21e2e55cef9c43a41d29f6cd2d09500b1cb81daedb64820e388ead70346 diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.0.ebuild new file mode 100644 index 000000000000..c13c3370cbbe --- /dev/null +++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit pypi + +DESCRIPTION="Shared setuptools wheel for ensurepip Python module" +HOMEPAGE="https://pypi.org/project/setuptools/" +SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")" +S=${DISTDIR} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND=" + !<dev-python/ensurepip-wheels-100 +" + +src_install() { + insinto /usr/lib/python/ensurepip + doins "${A}" +} diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index d79e6201d131..296464c32ad0 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,7 +1,3 @@ DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670 -DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d9815f55f0daab0cc28811b9adbfd3b2ede08f4c13e0dfa43c5fb283bc1ba96ea793084f3d65ba13b9697d14ffa406a273 SHA512 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b -DIST matplotlib-3.6.2.tar.gz 35843927 BLAKE2B 22b933b2ca2bfb156ee1592f522da6e7566f279fd6c7ef2d2f5aeb8697fc04085b57ba6bb5f7948572b3e671687b74d6ba9f7def2728b6224fbc98b121281a3c SHA512 51b84a4328a85f674cb44728955fca8bb5b8b702c788158b8bcfc13a44206a5a658ac12ed8f9a5f6ec53ef543395fab4f3871f91013ba1432f3e2b848c36976f -DIST matplotlib-3.6.3.tar.gz 35868590 BLAKE2B aa511e7d82c41ff2b5622b23847c2e94ed5d400be74eddcdab12ddba8d25bcc1b778c5fb2a29935bca71b76cbf4213088286c9a6a3d085e06036069909ccc1e7 SHA512 844ca90bcc9953d3d1289a6d471180a3dadb49c75eb59858bbbfb67d4b1292b83b86b366f22ab12d9e97c980376d48b86e745607ec4e812a3010c6fec01398dc -DIST matplotlib-3.7.0.tar.gz 36346055 BLAKE2B 558e14c5afaf7ec7f88604707b1adbd9bbcab7f8fcf2dfbc4d25b94b9fa55f4f04b4150d71f813a2be59b739dec1b70981afb0158d90fba03fbe19b291c3eafe SHA512 60207fb10394422b7a11faffb2775c23c377e6dd72ef9f3fde1099d50e1810c4be55cf814da74fd87faf49a628459472945bb901a4cbe73c9676df54b862ad5c DIST matplotlib-3.7.1.tar.gz 38003777 BLAKE2B a387d23b58e09011cd3ae1f8c0ebf5dd8c04c8c15c1f6453c92cd22b2439fcabcf384f39ae8d2d2c6b7d2645817cd57a60856a4c05728e8f8aff9dd163af5083 SHA512 d7db4213d5b38eba779ba06ffaa8e67a435192e4a8cf62f8e1cd4b8079cd257b2e83cb79926df012b7084c785c0ce8b03275035f68cfcf0a36b0dda7322f2e67 diff --git a/dev-python/matplotlib/files/matplotlib-3.6.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.6.0-test.patch deleted file mode 100644 index 4f0fe2207507..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.6.0-test.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 72702bcc76e3daf34d43aa76942f1008946712d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 24 Sep 2022 09:21:56 +0200 -Subject: [PATCH] Increase image comparison limits - -Most of the tests require exact match which apparently doesn't always -happen in non-pristine environments. Some of them have very big -differences due to texlive font rendering changes. ---- - lib/matplotlib/tests/test_arrow_patches.py | 6 +++--- - lib/matplotlib/tests/test_axes.py | 6 +++--- - lib/matplotlib/tests/test_backend_pgf.py | 2 +- - lib/matplotlib/tests/test_colorbar.py | 2 +- - lib/matplotlib/tests/test_contour.py | 2 +- - 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 | 3 ++- - lib/matplotlib/tests/test_streamplot.py | 3 ++- - lib/matplotlib/tests/test_units.py | 4 ++-- - lib/matplotlib/tests/test_usetex.py | 1 + - lib/mpl_toolkits/tests/test_axes_grid1.py | 2 +- - 13 files changed, 22 insertions(+), 19 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 a230af2ac1..c993d85856 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -1025,7 +1025,7 @@ def test_imshow(): - ax.imshow("r", data=data) - - --@image_comparison(['imshow_clip'], style='mpl20') -+@image_comparison(['imshow_clip'], style='mpl20', 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 -@@ -2334,7 +2334,7 @@ def test_contour_hatching(): - extend='both', alpha=0.5) - - --@image_comparison(['contour_colorbar'], style='mpl20') -+@image_comparison(['contour_colorbar'], style='mpl20', tol=0.015) - def test_contour_colorbar(): - x, y, z = contour_dat() - -@@ -4616,7 +4616,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)) - -diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py -index 482bc073a7..faa8cfa5ce 100644 ---- a/lib/matplotlib/tests/test_backend_pgf.py -+++ b/lib/matplotlib/tests/test_backend_pgf.py -@@ -79,7 +79,7 @@ def create_figure(): - # test compiling a figure to pdf with xelatex - @needs_pgf_xelatex - @pytest.mark.backend('pgf') --@image_comparison(['pgf_xelatex.pdf'], style='default') -+@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8) - def test_xelatex(): - rc_xelatex = {'font.family': 'serif', - 'pgf.rcfonts': False} -diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py -index 149ed4c3d2..bf10709297 100644 ---- a/lib/matplotlib/tests/test_colorbar.py -+++ b/lib/matplotlib/tests/test_colorbar.py -@@ -231,7 +231,7 @@ def test_colorbar_single_ax_panchor_east(constrained): - assert ax.get_anchor() == 'E' - - --@image_comparison(['contour_colorbar.png'], remove_text=True) -+@image_comparison(['contour_colorbar.png'], remove_text=True, 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_contour.py b/lib/matplotlib/tests/test_contour.py -index 2c76f34cb1..a6a0619443 100644 ---- a/lib/matplotlib/tests/test_contour.py -+++ b/lib/matplotlib/tests/test_contour.py -@@ -318,7 +318,7 @@ def test_contourf_log_extension(): - - - @image_comparison(['contour_addlines.png'], -- remove_text=True, style='mpl20', tol=0.03) -+ remove_text=True, style='mpl20', tol=0.2) - # 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 48b4a880e0..2b31fe6273 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) -diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py -index 46dbe4cfe8..cb171e83f8 100644 ---- a/lib/matplotlib/tests/test_image.py -+++ b/lib/matplotlib/tests/test_image.py -@@ -1323,7 +1323,7 @@ def test_nonuniform_and_pcolor(): - - - @image_comparison(["rgba_antialias.png"], style="mpl20", -- remove_text=True) -+ remove_text=True, tol=0.005) - 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 16847e0be6..80159952c1 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -118,7 +118,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) -@@ -127,7 +127,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) -@@ -153,7 +153,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 e7002df8a5..e83a90ccb1 100644 ---- a/lib/matplotlib/tests/test_lines.py -+++ b/lib/matplotlib/tests/test_lines.py -@@ -165,7 +165,8 @@ def test_set_drawstyle(): - assert len(line.get_path().vertices) == len(x) - - --@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20') -+@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20', -+ tol=0.62) - def test_set_line_coll_dash_image(): - fig, ax = plt.subplots() - np.random.seed(0) -diff --git a/lib/matplotlib/tests/test_streamplot.py b/lib/matplotlib/tests/test_streamplot.py -index 5ee6df09e4..ab059bb4a3 100644 ---- a/lib/matplotlib/tests/test_streamplot.py -+++ b/lib/matplotlib/tests/test_streamplot.py -@@ -34,7 +34,8 @@ def test_startpoints(): - plt.plot(start_x, start_y, 'ok') - - --@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20') -+@image_comparison(['streamplot_colormap'], remove_text=True, style='mpl20', -+ tol=0.002) - def test_colormap(): - X, Y, U, V = velocity_field() - plt.streamplot(X, Y, U, V, color=U, density=0.6, linewidth=2, -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 22309afdaf..0b7cea8ac4 100644 ---- a/lib/matplotlib/tests/test_usetex.py -+++ b/lib/matplotlib/tests/test_usetex.py -@@ -14,6 +14,7 @@ import matplotlib.pyplot as plt - pytestmark = needs_usetex - - -+@pytest.mark.skip(reason="TODO: broken") - @image_comparison( - baseline_images=['test_usetex'], - extensions=['pdf', 'png'], -diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py -index 374b8c721f..77b1d5f4a1 100644 ---- a/lib/mpl_toolkits/tests/test_axes_grid1.py -+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py -@@ -335,7 +335,7 @@ def test_zooming_with_inverted_axes(): - - - @image_comparison(['anchored_direction_arrows.png'], -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_anchored_direction_arrows(): - fig, ax = plt.subplots() - ax.imshow(np.zeros((10, 10)), interpolation='nearest') --- -2.37.3 - diff --git a/dev-python/matplotlib/files/matplotlib-3.6.2-test.patch b/dev-python/matplotlib/files/matplotlib-3.6.2-test.patch deleted file mode 100644 index b90b3d029ed2..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.6.2-test.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 889e0a965c40207340e458f72279aa996a21f96e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 3 Nov 2022 05:19:14 +0100 -Subject: [PATCH] Fix tests - ---- - lib/matplotlib/tests/test_arrow_patches.py | 6 +++--- - lib/matplotlib/tests/test_axes.py | 6 +++--- - lib/matplotlib/tests/test_backend_pgf.py | 2 +- - lib/matplotlib/tests/test_colorbar.py | 2 +- - lib/matplotlib/tests/test_contour.py | 2 +- - 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 | 3 ++- - lib/matplotlib/tests/test_units.py | 4 ++-- - lib/matplotlib/tests/test_usetex.py | 3 ++- - lib/mpl_toolkits/tests/test_axes_grid1.py | 2 +- - 12 files changed, 21 insertions(+), 19 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 -@@ -69,3 +69,3 @@ 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)) -@@ -84,3 +84,3 @@ 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)) -@@ -117,3 +117,3 @@ 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(): -diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 8d6466c749..15ec51e95c 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -1033,3 +1033,3 @@ def test_imshow(): - --@image_comparison(['imshow_clip'], style='mpl20') -+@image_comparison(['imshow_clip'], style='mpl20', tol=1.24) - def test_imshow_clip(): -@@ -2342,3 +2342,3 @@ def test_contour_hatching(): - --@image_comparison(['contour_colorbar'], style='mpl20') -+@image_comparison(['contour_colorbar'], style='mpl20', tol=0.015) - def test_contour_colorbar(): -@@ -4625,3 +4625,3 @@ 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(): -diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py -index 482bc073a7..faa8cfa5ce 100644 ---- a/lib/matplotlib/tests/test_backend_pgf.py -+++ b/lib/matplotlib/tests/test_backend_pgf.py -@@ -81,3 +81,3 @@ def create_figure(): - @pytest.mark.backend('pgf') --@image_comparison(['pgf_xelatex.pdf'], style='default') -+@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8) - def test_xelatex(): -diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py -index 4336b761f6..421d4455a7 100644 ---- a/lib/matplotlib/tests/test_colorbar.py -+++ b/lib/matplotlib/tests/test_colorbar.py -@@ -235,3 +235,3 @@ def test_colorbar_single_ax_panchor_east(constrained): - --@image_comparison(['contour_colorbar.png'], remove_text=True) -+@image_comparison(['contour_colorbar.png'], remove_text=True, tol=0.01) - def test_contour_colorbar(): -diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py -index 8bf77f0d54..aa9e9cbb7c 100644 ---- a/lib/matplotlib/tests/test_contour.py -+++ b/lib/matplotlib/tests/test_contour.py -@@ -321,3 +321,3 @@ def test_contourf_log_extension(): - @image_comparison(['contour_addlines.png'], -- remove_text=True, style='mpl20', tol=0.03) -+ remove_text=True, style='mpl20', tol=0.2) - # tolerance is because image changed minutely when tick finding on -diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py -index cc5a3b9ae2..3426d180b4 100644 ---- a/lib/matplotlib/tests/test_figure.py -+++ b/lib/matplotlib/tests/test_figure.py -@@ -28,3 +28,3 @@ 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(): -diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py -index 46dbe4cfe8..cb171e83f8 100644 ---- a/lib/matplotlib/tests/test_image.py -+++ b/lib/matplotlib/tests/test_image.py -@@ -1325,3 +1325,3 @@ def test_nonuniform_and_pcolor(): - @image_comparison(["rgba_antialias.png"], style="mpl20", -- remove_text=True) -+ remove_text=True, tol=0.005) - def test_rgba_antialias(): -diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 16847e0be6..80159952c1 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -120,3 +120,3 @@ 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(): -@@ -129,3 +129,3 @@ 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(): -@@ -155,3 +155,3 @@ 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(): -diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py -index e7002df8a5..e83a90ccb1 100644 ---- a/lib/matplotlib/tests/test_lines.py -+++ b/lib/matplotlib/tests/test_lines.py -@@ -167,3 +167,4 @@ def test_set_drawstyle(): - --@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20') -+@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20', -+ tol=0.62) - def test_set_line_coll_dash_image(): -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 -@@ -81,3 +81,3 @@ def quantity_converter(): - @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): -@@ -108,3 +108,3 @@ def test_numpy_facade(quantity_converter): - @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(): -diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py -index 0f01ebaffb..5e44dc8d22 100644 ---- a/lib/matplotlib/tests/test_usetex.py -+++ b/lib/matplotlib/tests/test_usetex.py -@@ -16,2 +16,3 @@ pytestmark = needs_usetex - -+@pytest.mark.skip(reason="TODO: broken") - @image_comparison( -@@ -66,3 +67,3 @@ def test_mathdefault(): - --@image_comparison(['eqnarray.png']) -+@image_comparison(['eqnarray.png'], tol=23) - def test_multiline_eqnarray(): -diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py -index 374b8c721f..77b1d5f4a1 100644 ---- a/lib/mpl_toolkits/tests/test_axes_grid1.py -+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py -@@ -337,3 +337,3 @@ def test_zooming_with_inverted_axes(): - @image_comparison(['anchored_direction_arrows.png'], -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_anchored_direction_arrows(): --- -2.38.1 - diff --git a/dev-python/matplotlib/files/matplotlib-3.6.3-test.patch b/dev-python/matplotlib/files/matplotlib-3.6.3-test.patch deleted file mode 100644 index 176f2f03c5c9..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.6.3-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 28294f8dc7305707c6e9a481c42416b2fb5714a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 12 Jan 2023 06:39:23 +0100 -Subject: [PATCH] Increase more tolerances - ---- - lib/matplotlib/tests/test_lines.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py -index e83a90ccb1..ddba36333f 100644 ---- a/lib/matplotlib/tests/test_lines.py -+++ b/lib/matplotlib/tests/test_lines.py -@@ -166,7 +166,7 @@ def test_set_drawstyle(): - - - @image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20', -- tol=0.62) -+ tol=0.65) - def test_set_line_coll_dash_image(): - fig, ax = plt.subplots() - np.random.seed(0) --- -2.39.0 - diff --git a/dev-python/matplotlib/files/matplotlib-3.7.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.7.0-test.patch deleted file mode 100644 index dc3ed23db44e..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.7.0-test.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 52720f5ecf37be3379f7e048cadd8cf9895377ed 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 | 6 +++--- - 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 | 3 ++- - 11 files changed, 22 insertions(+), 22 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 8bf6051b3e..fce27f1528 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -1034,7 +1034,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 -@@ -2364,7 +2364,7 @@ def test_contour_hatching(): - - @image_comparison( - ['contour_colorbar'], style='mpl20', -- tol=0.02 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0) -+ tol=0.02) - def test_contour_colorbar(): - x, y, z = contour_dat() - -@@ -4704,7 +4704,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)) - -diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py -index e39d007378..fa0cb2e72f 100644 ---- a/lib/matplotlib/tests/test_colorbar.py -+++ b/lib/matplotlib/tests/test_colorbar.py -@@ -237,7 +237,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 b0833052ad..c7633f6842 100644 ---- a/lib/matplotlib/tests/test_constrainedlayout.py -+++ b/lib/matplotlib/tests/test_constrainedlayout.py -@@ -651,11 +651,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 41d4dc8501..e0f9f5c112 100644 ---- a/lib/matplotlib/tests/test_contour.py -+++ b/lib/matplotlib/tests/test_contour.py -@@ -316,8 +316,7 @@ def test_contourf_log_extension(): - - @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(): -diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py -index f3ece07660..18c95e4a55 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) -diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py -index 76a622181d..af81d2fc0d 100644 ---- a/lib/matplotlib/tests/test_image.py -+++ b/lib/matplotlib/tests/test_image.py -@@ -1339,7 +1339,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 a8d7fd107d..2f658bc116 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -174,7 +174,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) -@@ -183,7 +183,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) -@@ -209,7 +209,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 7eecf5675a..d08cc79172 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.62 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 85a63ecc2f..3cfbb260a2 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 0f01ebaffb..5e44dc8d22 100644 ---- a/lib/matplotlib/tests/test_usetex.py -+++ b/lib/matplotlib/tests/test_usetex.py -@@ -14,6 +14,7 @@ import matplotlib.pyplot as plt - pytestmark = needs_usetex - - -+@pytest.mark.skip(reason="TODO: broken") - @image_comparison( - baseline_images=['test_usetex'], - extensions=['pdf', 'png'], -@@ -64,7 +65,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*}' --- -2.39.1 - diff --git a/dev-python/matplotlib/matplotlib-3.6.1.ebuild b/dev-python/matplotlib/matplotlib-3.6.1.ebuild deleted file mode 100644 index ca5a6ad90c1b..000000000000 --- a/dev-python/matplotlib/matplotlib-3.6.1.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic multiprocessing prefix 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=" - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - 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 ~ppc ~ppc64 ~riscv ~x86" -IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" - -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - dev-python/certifi[${PYTHON_USEDEP}] - >=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.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.2.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/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013:= - 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? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - webagg? ( - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{8..10}) - ) -" - -BDEPEND=" - ${RDEPEND} - >=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/mock[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) -" - -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.6.0-test.patch - ) - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - sed -i -e '/setuptools_scm/s:,<7::' setup.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 - ) - [[ ${EPYTHON} == 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'}]" - ) - - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - grep -v system_freetype "${BUILD_DIR}"/setup.cfg \ - > "${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 - nonfatal epytest --pyargs matplotlib -m "not network" \ - -p xdist.plugin -n "$(makeopts_jobs)" || die -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/matplotlib/matplotlib-3.6.2.ebuild b/dev-python/matplotlib/matplotlib-3.6.2.ebuild deleted file mode 100644 index 43ec46529dd4..000000000000 --- a/dev-python/matplotlib/matplotlib-3.6.2.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic multiprocessing prefix 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=" - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - 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" -IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" - -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - dev-python/certifi[${PYTHON_USEDEP}] - >=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.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.2.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/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013:= - 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? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - webagg? ( - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{8..10}) - ) -" - -BDEPEND=" - ${RDEPEND} - >=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/mock[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) -" - -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.6.2-test.patch - ) - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - sed -i -e '/setuptools_scm/s:,<7::' setup.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 - ) - [[ ${EPYTHON} == 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'}]" - ) - - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - grep -v system_freetype "${BUILD_DIR}"/setup.cfg \ - > "${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 - nonfatal epytest --pyargs matplotlib -m "not network" \ - -p xdist.plugin -n "$(makeopts_jobs)" || die -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/matplotlib/matplotlib-3.6.3.ebuild b/dev-python/matplotlib/matplotlib-3.6.3.ebuild deleted file mode 100644 index c86293e6b6b3..000000000000 --- a/dev-python/matplotlib/matplotlib-3.6.3.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic multiprocessing prefix 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=" - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - 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" -IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" - -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - dev-python/certifi[${PYTHON_USEDEP}] - >=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.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.2.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/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013:= - 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? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - webagg? ( - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{8..10}) - ) -" - -BDEPEND=" - ${RDEPEND} - >=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/mock[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) -" - -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.6.2-test.patch - "${FILESDIR}"/matplotlib-3.6.3-test.patch - ) - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - sed -i -e '/setuptools_scm/s:,<7::' setup.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 - ) - [[ ${EPYTHON} == 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'}]" - ) - - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - grep -v system_freetype "${BUILD_DIR}"/setup.cfg \ - > "${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 - nonfatal epytest --pyargs matplotlib -m "not network" \ - -p xdist.plugin -n "$(makeopts_jobs)" || die -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/matplotlib/matplotlib-3.7.0.ebuild b/dev-python/matplotlib/matplotlib-3.7.0.ebuild deleted file mode 100644 index 2a341a6eaeea..000000000000 --- a/dev-python/matplotlib/matplotlib-3.7.0.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic multiprocessing prefix pypi -inherit 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" -IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" - -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - dev-python/certifi[${PYTHON_USEDEP}] - >=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.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.20[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[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/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013:= - virtual/imagemagick-tools[jpeg,tiff] - $(python_gen_cond_dep ' - dev-python/importlib-resources[${PYTHON_USEDEP}] - ' 3.9) - 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? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - webagg? ( - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{8..10}) - ) -" - -BDEPEND=" - ${RDEPEND} - >=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/mock[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}] - >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) -" - -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.7.0-test.patch - ) - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - sed -i -e '/setuptools_scm/s:,<7::' setup.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 - # unhappy about xdist - tests/test_widgets.py::test_span_selector_animated_artists_callback - ) - [[ ${EPYTHON} == 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'}]" - ) - - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - grep -v system_freetype "${BUILD_DIR}"/setup.cfg \ - > "${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 - nonfatal epytest --pyargs matplotlib -m "not network" \ - -p xdist.plugin -n "$(makeopts_jobs)" || die -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest index eadd8d25307f..fbc5241d9371 100644 --- a/dev-python/mss/Manifest +++ b/dev-python/mss/Manifest @@ -1,4 +1,5 @@ DIST mss-8.0.3.tar.gz 87005 BLAKE2B de2a6da2b9232a14c460167fd721028684b580a9f57c13b90d101e644f73055c0d10afa727e6cb21b522634b7f2f1f3c657b5823a506723d3c7621c65d174ce7 SHA512 0397f4bc96e5fe4a8935a81ba63ab2e2d6cc20876fd156350a4bfa9ac0e928e357857729c9231c6ead5f091349f7f1b51fdb3d772621bf2dc799c5ca60f28b21 DIST mss-9.0.0.tar.gz 87286 BLAKE2B 895d06afe334649f5ba3bfb6872dfe4e0d04bbfdc88cd7fd54a986566fc4696b09c257c3f53c3ddb9467ce9d248e5dc533b806da63813180d8f1475c78035968 SHA512 2a1d0c522f8ab8023df61ccbe70b8a644474ba91775b1450522dd265ce544c1d04bf855b1ee1ddb5dff7d82229394447ae1eac359ec499c7afaf70e35321bdec +DIST mss-9.0.1.tar.gz 87504 BLAKE2B 445392b65b62e67802397e708781cbf1b3409303c68d863c4f44b0f32026b196faba1a6bb960110917ea6cf2b34b43d61d4e069fac6f6926af3e6a0b5fbab800 SHA512 22c4aa56eaf5d3c6ca752a8c966908b35256056a23f5f707d2ccd5acfbefecec6b6b8bff5d8c18024ef94f365a6ce1433aafddfdf9f7f30180af5dbd8a1f8eb7 DIST python-mss-7.0.1.gh.tar.gz 91121 BLAKE2B 67061500cf751b76d8507b164f17caa028261a5a52107603249cab4634205c52518231e0038428cce7a219effcf07a951056ae44a09cbc2dc01f10aed984db6a SHA512 efdbfc94a1218842db109e2dbd0659bb426a958050c9a3dc5802f018727bcbfeb3ca8dec6bdec914c894f4153cbd1994cd3ad976435407b271d127e957b1fda6 DIST python-mss-8.0.2.gh.tar.gz 84555 BLAKE2B 6ba192a08a03a18aef8d2a749e363fb59fadbaf2a6c7c3368f6b23b1d2ad41d63ea4dffbc3e978315fdc7a8f5a774c1385ca8209fb94b2b00734126774b2d8c5 SHA512 6c43d608743dbd2ee25a94007ff54d9f3b984c9e9d2932191ea2d9ed3c64e3a969ee09b6ff0fb6a36dc3da3b3c26a9a0624f8f84556801902d6716e9a8236ecb diff --git a/dev-python/mss/mss-9.0.1.ebuild b/dev-python/mss/mss-9.0.1.ebuild new file mode 100644 index 000000000000..e989a48908ba --- /dev/null +++ b/dev-python/mss/mss-9.0.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit distutils-r1 pypi virtualx + +DESCRIPTION="An ultra fast cross-platform multiple screenshots module in python using ctypes" +HOMEPAGE=" + https://github.com/BoboTiG/python-mss/ + https://pypi.org/project/mss/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +BDEPEND=" + test? ( + dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] + dev-python/pyvirtualdisplay[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest +distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme + +EPYTEST_IGNORE=( + # upstream tests for self-build, apparently broken by setuptools + # issuing deprecation warnings + src/tests/test_setup.py +) + +EPYTEST_DESELECT=( + # unreliable `lsof -U | grep ...` tests + src/tests/test_leaks.py +) + +src_prepare() { + sed -i -e '/--cov/d' setup.cfg || die + distutils-r1_src_prepare +} + +src_test() { + virtx distutils-r1_src_test +} diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest index 1d7a5d73cb0d..a0bee08f8030 100644 --- a/dev-python/python-dbusmock/Manifest +++ b/dev-python/python-dbusmock/Manifest @@ -1 +1,2 @@ -DIST python-dbusmock-0.28.7.gh.tar.gz 91302 BLAKE2B edad30e569652b2fc8e2f7437e818eece2b88be460ca31eab0be6a6951f0690a295fa1af3f7a490794bcc454e021cea3e153b300ce55883a9cf8010aac8212a4 SHA512 d0fea9ad3a9f76af75f48a4e645f8ed70efde880043c9b843bc8cac53eca891c45fa9c74cefab63a820397886757ac0dc9c5f43aaf7604aa302c794aedb7bb46 +DIST python-dbusmock-0.28.7.tar.gz 91302 BLAKE2B edad30e569652b2fc8e2f7437e818eece2b88be460ca31eab0be6a6951f0690a295fa1af3f7a490794bcc454e021cea3e153b300ce55883a9cf8010aac8212a4 SHA512 d0fea9ad3a9f76af75f48a4e645f8ed70efde880043c9b843bc8cac53eca891c45fa9c74cefab63a820397886757ac0dc9c5f43aaf7604aa302c794aedb7bb46 +DIST python-dbusmock-0.29.0.tar.gz 92406 BLAKE2B e23a7e81584a94532258237e75f35d1c7fe2cba901d30e1a211d61ce48db2992f1c19d08401059b60b80a3aa7bf6c1e21d096bd30eacb27d16c3189b1f9b7938 SHA512 618f6069802cdfcab41e09c9ed27f2c55c35f072bea4c0b38c057297ff3de0759b1b37128fee8d331d058f3c2a4607f25f0d8b42077f5b4fc155c6e5a4cb94c3 diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.7.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.7.ebuild index 0fc0387245e1..f47abc37e8d6 100644 --- a/dev-python/python-dbusmock/python-dbusmock-0.28.7.ebuild +++ b/dev-python/python-dbusmock/python-dbusmock-0.28.7.ebuild @@ -4,20 +4,17 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 PYTHON_COMPAT=( python3_{7,8,9,10,11} ) PYTHON_REQ_USE="xml(+)" -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Easily create mock objects on D-Bus for software testing" HOMEPAGE=" https://github.com/martinpitt/python-dbusmock/ https://pypi.org/project/python-dbusmock/ " -SRC_URI=" - https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz - -> ${P}.gh.tar.gz -" LICENSE="LGPL-3+" SLOT="0" diff --git a/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild new file mode 100644 index 000000000000..75941c7ce188 --- /dev/null +++ b/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 pypi + +DESCRIPTION="Easily create mock objects on D-Bus for software testing" +HOMEPAGE=" + https://github.com/martinpitt/python-dbusmock/ + https://pypi.org/project/python-dbusmock/ +" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND=" + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # linter tests, fragile to newer linter versions + tests/test_code.py +) + +src_prepare() { + # dev-python/dbus-python uses autotools, so no .dist-info there + sed -i '/dbus-python/d' pyproject.toml setup.cfg || die + + distutils-r1_src_prepare +} diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest index dcb5529266b8..6fcdc932948e 100644 --- a/dev-python/scikit-build/Manifest +++ b/dev-python/scikit-build/Manifest @@ -4,3 +4,4 @@ DIST scikit-build-0.16.6.tar.gz 272201 BLAKE2B bb14b0db52d0c04b9630fa27ccbc58c7a DIST scikit-build-0.16.7.tar.gz 274287 BLAKE2B 8a5064c021d904312ccf89a396ab794b89b73ad1b6238767ca74eeb394f0f1514eedd3c746353ee3e9e7b825988b3c52c563e1f19d0acfbe69213c5a306f1dcc SHA512 5bba94214c249f891b2972301b0e37b5f10938151e37a04b845dfc9e11ae85edc7e3880984f9fbbd1c037257fc8baa3ba7b006b1f1b7abb941d1a54e049f3cbc DIST scikit_build-0.17.0.tar.gz 266282 BLAKE2B ca8d9fbb422363850b4ad12d3b8e2ad6e1664b8b7354c64e6fc1ad4ab1965a3be92c24699041b67dc91c2be02f7d17be3eefd9a909ea0380149eb5b58e01ea49 SHA512 0ad536ac624eecc0710b5e65ec976cc9f8eb15f0017edf79016724ae8321909c134cf9b6842f58d80b3e62edad95652987339e26e3c576b909adccd3a2f492d1 DIST scikit_build-0.17.1.tar.gz 267911 BLAKE2B 365e7e4bcc902a00464b157feaee4efcddff3fca8c8026b252b25b44de5ed5a646c21d29df55133d6945868f346f638c5adcf9da530b1ff6bcb5689d0f33bf90 SHA512 617a68d92787c576f1c3fc9c24c8cc90e1fe976a853f3ae81442e1a99a20e1f4049d7ffac967c2248bf172f07a3e2092fc28b8d558b35da628a58cd3d9d16ae3 +DIST scikit_build-0.17.2.tar.gz 268269 BLAKE2B 9ca0f860b8bdab235ae9e59ce5ca8b82320b8a2e806e787f9acdfd58ac0dd6c6e28e0a71e7c0177bf87022ecd2d73bd3783b5eaaa899f273d5b65399ef03e77e SHA512 a6ff41958e336679a0996c63627ee1486c81f36fa0ace3418137421626ab068b4eca29e470cf1cc92c82c5cb3ebe45ec710fe7d098e349deb6f1d3735ed6338c diff --git a/dev-python/scikit-build/scikit-build-0.17.2.ebuild b/dev-python/scikit-build/scikit-build-0.17.2.ebuild new file mode 100644 index 000000000000..2439d933fc24 --- /dev/null +++ b/dev-python/scikit-build/scikit-build-0.17.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions" +HOMEPAGE=" + https://github.com/scikit-build/scikit-build/ + https://pypi.org/project/scikit-build/ +" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND=" + dev-python/distro[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + >=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/tomli[${PYTHON_USEDEP}] + ' 3.{9..10}) + >=dev-python/wheel-0.32.0[${PYTHON_USEDEP}] +" + +BDEPEND=" + dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}] + dev-python/hatch-vcs[${PYTHON_USEDEP}] + test? ( + >=dev-python/build-0.7[${PYTHON_USEDEP}] + >=dev-python/cython-0.25.1[${PYTHON_USEDEP}] + >=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}] + >=dev-python/pytest-virtualenv-1.2.5[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs \ + dev-python/sphinx-rtd-theme \ + dev-python/sphinx-issues +distutils_enable_tests pytest + +src_prepare() { + # not packaged + sed -i -e '/cmakedomain/d' docs/conf.py || die + distutils-r1_src_prepare +} + +python_test() { + epytest -m "not isolated and not nosetuptoolsscm" + rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die +} diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest index bf48763a7d9e..88e1ca57c849 100644 --- a/dev-python/scipy/Manifest +++ b/dev-python/scipy/Manifest @@ -1,8 +1,5 @@ -DIST scipy-1.10.0.tar.gz 42398693 BLAKE2B fc2c1ef997fb14716453d94a6d12f8cbdfb742c99bec2c5c504a70248217e44d84b3326304e7bfafd3a52b968de3404b0a084d1e8043295842d01f4337732d91 SHA512 13fec0a2c24b90617ad4701c43c54757c91d2c62ca4b9ea5e5c5d130177ba4d2bb8687aae9057b58c26d1a77e4291164bad7ba9e21352669c07ba18bf539ad32 DIST scipy-1.10.1.tar.gz 42407997 BLAKE2B 807dceb1e056a1a2c0ec354e4e21f64e59cdab9eaf286cec3783bb93bf80efa00a71e7bd8d1898e8a2fdf86b614f035a0a97436dc4515574d73d9d4521824316 SHA512 767e1dee6285d98e4d58d8d8d1e3654b00e3216e9ad55455fc9473f1d044bef80ecce749bcd24d8f331367b882c9c3e6b652a6e901bb4296ddc7cc44699215b6 -DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B 0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328 SHA512 5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2 DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9ec462a3fd2ea44b62564cff6fb27a4deaccc59e0e738cc0c997b0a7de948bf9f2db6fa7896323405a072e0111 SHA512 119f9a5e1ce3b4268ba38a0eb82dff78837593d9a5c5e464663925a4b3b1de060201fe568236e19ed0996a045754333c580e181c4cdec2cc707e57060f59364e -DIST scipy-html-1.10.0.zip 65656379 BLAKE2B 4a4f1e428bc2355f32be05e35634e5aaccb0938f170ee247931a892cf7ab59b3a9ab952060e98936e153bed752c29c01ed34eba02188b3514de7607285c01d08 SHA512 3bda526f209905355b3f87ba1529b9f45c3580ce7d9b80a63931871dab1542347f243c9f688854cb67d575e9a645ec89105775accdc746fc290113f28978b73b DIST scipy-html-1.10.1.zip 49191107 BLAKE2B 5163ae3a62745992bcf94ab02ca2bb13fcf6d2ae0eb2a113ba29bc37a8e8f40ec70e39fe16e6371ce0bc31d4c8f0f46746be91b4fe2ad41c68a985c6f00fb8e7 SHA512 f3252452d3bfd400890f29460de2f97bf72732e0fc864582e906b78808e856ead5b1bf97cba531f2150e396408e585499d127004231421d20108e96040316232 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728 diff --git a/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch b/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch deleted file mode 100644 index 23d29c31c2cb..000000000000 --- a/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 5935bb8..f8c14ce 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,6 +1,6 @@ --option('blas', type: 'string', value: 'openblas', -+option('blas', type: 'string', value: 'blas', - description: 'option for BLAS library switching') --option('lapack', type: 'string', value: 'openblas', -+option('lapack', type: 'string', value: 'lapack', - description: 'option for LAPACK library switching') - option('use-g77-abi', type: 'boolean', value: 'false', - description: 'If set to true, forces using g77 compatibility wrappers ' + -diff --git a/meson.build b/meson.build -index d80ebc93e..c0c92c00f 100644 ---- a/meson.build -+++ b/meson.build -@@ -16,8 +16,8 @@ project( - 'c_args=-Wno-unused-function -Wno-conversion -Wno-misleading-indentation -Wno-incompatible-pointer-types', - 'fortran_args=-Wno-conversion', - 'fortran_std=legacy', -- 'blas=openblas', -- 'lapack=openblas' -+ 'blas=blas', -+ 'lapack=lapack' - ], - ) - diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml index 285cbbdd9927..0df0d7cadf61 100644 --- a/dev-python/scipy/metadata.xml +++ b/dev-python/scipy/metadata.xml @@ -18,8 +18,5 @@ algorithms, ODE solvers, and others. </longdescription> - <use> - <flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag> - </use> <origin>gentoo-staging</origin> </pkgmetadata>
\ No newline at end of file diff --git a/dev-python/scipy/scipy-1.10.0.ebuild b/dev-python/scipy/scipy-1.10.0.ebuild deleted file mode 100644 index bafd6d8fe70d..000000000000 --- a/dev-python/scipy/scipy-1.10.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -PYTHON_REQ_USE="threads(+)" - -inherit fortran-2 distutils-r1 multiprocessing - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - # Upstream is often behind with doc updates - DOC_PV=1.10.0 - MY_PV=${PV/_rc/rc} - MY_P=${PN}-${MY_PV} - - SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - )" - S="${WORKDIR}"/${MY_P} - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="amd64 arm arm64 -hppa ~ppc ppc64 ~riscv ~sparc x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +fortran test-rust" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.19.5[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] - >=dev-python/meson-python-0.11[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-util/meson-0.62.2 - dev-util/patchelf - virtual/pkgconfig - doc? ( app-arch/unzip ) - fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) - test-rust? ( - dev-python/pooch[${PYTHON_USEDEP}] - ) -" - -EPYTEST_DESELECT=( - linalg/tests/test_decomp.py::TestSchur::test_sort - linalg/tests/test_solvers.py::test_solve_discrete_are - optimize/tests/test_milp.py::test_milp_timeout_16545 - - # Network - datasets/tests/test_data.py::TestDatasets::test_existence_all - datasets/tests/test_data.py::TestDatasets::test_ascent - datasets/tests/test_data.py::TestDatasets::test_face - datasets/tests/test_data.py::TestDatasets::test_electrocardiogram -) - -distutils_enable_tests pytest - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -python_configure_all() { - export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) - DISTUTILS_ARGS=( - -Dblas=blas - -Dlapack=lapack - ) -} - -python_test() { - cd "${T}" || die - - if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then - EPYTEST_IGNORE+=( - datasets/tests/test_data.py - ) - fi - - epytest -n "$(makeopts_jobs)" --pyargs scipy -} - -python_install_all() { - use doc && local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/scipy/scipy-1.9.2.ebuild b/dev-python/scipy/scipy-1.9.2.ebuild deleted file mode 100644 index d71293d7d50d..000000000000 --- a/dev-python/scipy/scipy-1.9.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=meson-python -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -PYTHON_REQ_USE="threads(+)" - -inherit fortran-2 distutils-r1 multiprocessing - -DESCRIPTION="Scientific algorithms library for Python" -HOMEPAGE=" - https://scipy.org/ - https://github.com/scipy/scipy/ - https://pypi.org/project/scipy/ -" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - - # Need submodules, so git for now. - EGIT_REPO_URI="https://github.com/scipy/scipy" - EGIT_BRANCH="maintenance/$(ver_cut 1-2).x" - EGIT_SUBMODULES=( '*' ) -else - # Upstream is often behind with doc updates - DOC_PV=1.8.1 - MY_PV=${PV/_rc/rc} - MY_P=${PN}-${MY_PV} - - SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz - doc? ( - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip - https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf - )" - S="${WORKDIR}"/${MY_P} - - if [[ ${PV} != *rc* ]] ; then - KEYWORDS="amd64 arm arm64 -hppa ppc ppc64 ~riscv ~s390 x86" - fi -fi - -LICENSE="BSD LGPL-2" -SLOT="0" -IUSE="doc +pythran" - -# umfpack is technically optional but it's preferred to have it available. -DEPEND=" - >=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}] - sci-libs/arpack:= - sci-libs/umfpack - virtual/cblas - >=virtual/lapack-3.8 -" -RDEPEND=" - ${DEPEND} - dev-python/pillow[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-lang/swig - >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-util/meson-0.62.2 - dev-util/patchelf - virtual/pkgconfig - doc? ( app-arch/unzip ) - pythran? ( dev-python/pythran[${PYTHON_USEDEP}] ) - test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch -) - -EPYTEST_DESELECT=( - linalg/tests/test_decomp.py::TestSchur::test_sort - linalg/tests/test_solvers.py::test_solve_discrete_are -) - -distutils_enable_tests pytest - -src_unpack() { - default - - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -src_configure() { - export SCIPY_USE_PYTHRAN=$(usex pythran 1 0) -} - -python_test() { - cd "${T}" || die - - epytest -n "$(makeopts_jobs)" --pyargs scipy -} - -python_install_all() { - use doc && \ - local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \ - local HTML_DOCS=( "${WORKDIR}"/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest index 660c45a7d2ab..8d2a882c01e0 100644 --- a/dev-python/selenium/Manifest +++ b/dev-python/selenium/Manifest @@ -1,3 +1,5 @@ DIST selenium-4.5.0-py3-none-any.whl 995204 BLAKE2B 214050a4e410a4689255ec8472a1cb35a37596e73d46c48769aa8e184b6f84e281a20e7e5f812b8185edacfcbca6eed77507aa59ffcaeae384f962b4214928a0 SHA512 b22d80d750c85337a2b793799b5a63b11bed45d11b874c1a64c02f53b4adb57263e69bebc79203de3bdfa5b8708203959971723cf0aef7fb68bd1b2a9028e9d9 DIST selenium-4.8.3.tar.gz 6332823 BLAKE2B cf874ab56182471055aa3d76d8828529f3c54f04eb9b7bd9342a87eade9c39875eecf00fce4f47019d5453bd65a0e5ace99170770394fc21bec1cf8d7998c579 SHA512 8bcaacb1f809e92ba9c1d14ccc0560979a29d27d61bfcd7d7fa08c3ee877c98699a0c5ffbb361ea37f0cc01a51b44b3d04ed4df025340bea7f842b4376d2715c +DIST selenium-4.9.0.tar.gz 6336895 BLAKE2B 4a812324abd1903f14b03a73d21125eb83b753a553bcc4515aa4a3dc792bfb07bfacf34e35357f81c36675d9079bafe5f289a63c709df57358103a9141cef535 SHA512 3bfba3d862de73261e984e4dce3c2ff77b0f57074073b38648cbbe6908f2d20a5fadef8b23b6a292d780bfe3556291e26c2a7b1cc4b314cc959e78e0a2dcc6dc DIST selenium-selenium-4.8.3-python.gh.tar.gz 90236640 BLAKE2B 943497a5015da8a626f210568715c6839b566feb7a04cf28230c2eded44ca3d110d782d9f90730206c0a2135200d81a960d60974662ce63dc1cf2e3cc09a4f0e SHA512 d3182eec2229872860ba370e99b3093fe73a519e839bfdcd01b2c3cc74e28b51c272e7fe176c2123d2af21d6cda1fec99051362c4ee10469359d8a24a8bdc7e8 +DIST selenium-selenium-4.9.0.gh.tar.gz 90247221 BLAKE2B fe99ac519ef4ced5f61721d1e3bae70e938b4a481582623a33f4d5a2fd1978c42e216501eb25ac7496957c2ea37a3ad97aff7ab7adf440e1428a311410024aca SHA512 9e745eae4cf6ea95fe1268b79a80734f4b67b0948fa5bfb144d6b681cd4b353add5c1a1d16b3f35652b6fa4a5b135f8a5203de97fcb9af0c27060a45b6269225 diff --git a/dev-python/selenium/selenium-4.9.0.ebuild b/dev-python/selenium/selenium-4.9.0.ebuild new file mode 100644 index 000000000000..f7ee3037ec49 --- /dev/null +++ b/dev-python/selenium/selenium-4.9.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit distutils-r1 pypi + +# upstream sometimes tags it as ${P}, sometimes as ${P}-python, sigh +TEST_TAG=${P} +TEST_P=selenium-${TEST_TAG} + +DESCRIPTION="Python language binding for Selenium Remote Control" +HOMEPAGE=" + https://www.seleniumhq.org/ + https://github.com/SeleniumHQ/selenium/tree/trunk/py/ + https://pypi.org/project/selenium/ +" +SRC_URI+=" + test? ( + https://github.com/SeleniumHQ/selenium/archive/${TEST_TAG}.tar.gz + -> ${TEST_P}.gh.tar.gz + ) +" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + >=dev-python/certifi-2021.10.8[${PYTHON_USEDEP}] + <dev-python/trio-1[${PYTHON_USEDEP}] + >=dev-python/trio-0.17[${PYTHON_USEDEP}] + <dev-python/trio-websocket-1[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9[${PYTHON_USEDEP}] + <dev-python/urllib3-2[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest-mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_test() { + local EPYTEST_DESELECT=( + # TODO: we may need extra setup or deps + test/selenium + + # expects vanilla certifi + test/unit/selenium/webdriver/remote/remote_connection_tests.py::test_get_connection_manager_for_certs_and_timeout + ) + + cd "${WORKDIR}/${TEST_P}/py" || die + rm -rf selenium || die + # https://github.com/SeleniumHQ/selenium/blob/selenium-4.8.2-python/py/test/runner/run_pytest.py#L20-L24 + # seriously? + epytest -o "python_files=*_tests.py test_*.py" +} diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 28419080bc2b..67d29fb2a9ec 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1 +1,2 @@ DIST setuptools-67.6.1.tar.gz 2486256 BLAKE2B 7827eec689b6a4463888137660489a29cd6aa67a14f0cf42ece78463788d74b97bd951b75c48c185c5c33d5bea29c44c8660649bf79035012bc75b915e9d0a42 SHA512 197910ad4c4058af0107e240d2e27bc2c1ff373cb3fba33af09eb3cc42614c45e4bb73a65802f253466eafd94517e08b51e98f50213817ad03d88ee0ccf9adbc +DIST setuptools-67.7.0.tar.gz 2491327 BLAKE2B 3d1e89cf5b2753883397ff3a668dbfcef41c57775bd1871ada69c11a7deffe53fd4c4036b5c98146ec0496b1be86df1522c64cc981acb5ec192bd93bd800c2de SHA512 39502337b5d7f710c55219ab970a5cab23e8987598af722ad231d2dea2e1dfaaddb09dc698a5746a719b36e5e3065c48ecee2ac428e4d41470bec6ad3c99daf6 diff --git a/dev-python/setuptools/setuptools-67.7.0.ebuild b/dev-python/setuptools/setuptools-67.7.0.ebuild new file mode 100644 index 000000000000..617e61b823a9 --- /dev/null +++ b/dev-python/setuptools/setuptools-67.7.0.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 8 -- sys-apps/portage dep +EAPI=8 + +# please bump dev-python/ensurepip-setuptools along with this package! + +DISTUTILS_USE_PEP517=standalone +PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 multiprocessing pypi + +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE=" + https://github.com/pypa/setuptools/ + https://pypi.org/project/setuptools/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}] + >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}] + >=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}] + >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}] + >=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}] + >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}] + ' 3.9) +" +BDEPEND=" + ${RDEPEND} + >=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}] + test? ( + $(python_gen_cond_dep ' + dev-python/build[${PYTHON_USEDEP}] + >=dev-python/ini2toml-0.9[${PYTHON_USEDEP}] + >=dev-python/filelock-3.4.0[${PYTHON_USEDEP}] + >=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}] + >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pip-run[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ' "${PYTHON_TESTED[@]}") + ) +" +PDEPEND=" + >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] + dev-python/setuptools-scm[${PYTHON_USEDEP}] +" + +DOCS=( {CHANGES,README}.rst ) + +src_prepare() { + local PATCHES=( + # TODO: remove this when we're 100% PEP517 mode + "${FILESDIR}"/setuptools-62.4.0-py-compile.patch + ) + + distutils-r1_src_prepare + + # remove bundled dependencies, setuptools will switch to system deps + # automatically + rm -r */_vendor || die + + # remove the ugly */extern hack that breaks on unvendored deps + rm -r */extern || die + find -name '*.py' -exec sed \ + -e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \ + -i {} + || die +} + +python_test() { + local -x SETUPTOOLS_USE_DISTUTILS=stdlib + + if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then + return + fi + + local EPYTEST_DESELECT=( + # network + # TODO: see if PRE_BUILT_SETUPTOOLS_* helps + setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg + setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist + setuptools/tests/test_build_meta.py::test_legacy_editable_install + setuptools/tests/test_distutils_adoption.py + setuptools/tests/test_editable_install.py + setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests + setuptools/tests/test_virtualenv.py::test_clean_env_install + setuptools/tests/test_virtualenv.py::test_no_missing_dependencies + setuptools/tests/test_virtualenv.py::test_test_command_install_requirements + # TODO + setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic + setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors + setuptools/tests/test_extern.py::test_distribution_picklable + # expects bundled deps in virtualenv + setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist + setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel + setuptools/tests/test_editable_install.py::test_editable_with_pyproject + # fails if python-xlib is installed + setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts + ) + + if has_version "<dev-python/packaging-22"; then + EPYTEST_DESELECT+=( + # old packaging is more lenient + setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig + ) + fi + + epytest -n "$(makeopts_jobs)" setuptools +} diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest index 049b8deb9f91..8fb603dd3675 100644 --- a/dev-python/trove-classifiers/Manifest +++ b/dev-python/trove-classifiers/Manifest @@ -1,2 +1,3 @@ DIST trove-classifiers-2023.3.9.tar.gz 15792 BLAKE2B 1b96dae0f4a141ab5a5e4f3ebe5fbede972b6d09cd289bded3192dfffb26dd68d85bdd46bec20c1b9fb83dc3f8c521e4512a995fe5950c07c9ccf8d53986aca3 SHA512 a94b4c6d7102934677c4debd55274770d4de7db9ad641a253e4718f65dd4b624a4b0c8f6e83cdaf5ea484cecc975baf8dcee0e50824fc373760b8c5cc2e25f89 DIST trove-classifiers-2023.4.18.tar.gz 15808 BLAKE2B 72b6b7efa53d40859464f5b055bd62d9a5e82032bcf9be22ec2108761ab383d24791ea2707f96c5cc54af271bfa66f8d17cbe665271aa5c87333aa16e4b58b02 SHA512 b56c4c1c44f3c68b9499fe754adce169202b6bd406d00234ad11d8d6ba9ce0ddb13ea883cfe83e342bd580f3021bf304ea30ed9fe6ef214c8ce60fceab0ced99 +DIST trove-classifiers-2023.4.20.tar.gz 15814 BLAKE2B 5f28f08143f9a08f3a731133b8eac32276b6d5ea582b7e4f6700a481b87da6ffce4cbf0ca6e9a2a70713ad1bdecec27427e60c0751dd2f5ecaace21f68b74221 SHA512 cc046e1cc7d4ff10829b3f6ff9ccedd1f2143bc27c84232dabc79368d78648266166f96fbcc50c8690bef47d28d1920c9855fcf1483620b003b7366b3ba798bc diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.4.20.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.4.20.ebuild new file mode 100644 index 000000000000..e0200e183d0d --- /dev/null +++ b/dev-python/trove-classifiers/trove-classifiers-2023.4.20.ebuild @@ -0,0 +1,31 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)" +HOMEPAGE=" + https://github.com/pypa/trove-classifiers/ + https://pypi.org/project/trove-classifiers/ +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +BDEPEND=" + dev-python/calver[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +python_test() { + epytest + "${EPYTHON}" -m tests.lib || die +} |
