From fa9f7e190f626ce3fd9a972abd0ed1bafa9b8a13 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Tue, 25 Oct 2022 13:05:17 +0000 Subject: Adding metadata --- dev-python/aiohttp/aiohttp-3.8.3.ebuild | 2 +- dev-python/aws-sam-translator/Manifest | 3 - .../aws-sam-translator-1.50.0.ebuild | 59 ----- .../aws-sam-translator-1.51.0.ebuild | 59 ----- .../aws-sam-translator-1.52.0.ebuild | 59 ----- .../aws-sam-translator-1.53.0.ebuild | 2 +- dev-python/boto3/Manifest | 8 +- dev-python/boto3/boto3-1.24.80.ebuild | 68 ----- dev-python/boto3/boto3-1.24.89.ebuild | 68 ----- dev-python/boto3/boto3-1.24.90.ebuild | 68 ----- dev-python/boto3/boto3-1.24.91.ebuild | 68 ----- dev-python/boto3/boto3-1.24.92.ebuild | 68 ----- dev-python/boto3/boto3-1.24.93.ebuild | 68 ----- dev-python/boto3/boto3-1.24.95.ebuild | 68 ----- dev-python/boto3/boto3-1.25.0.ebuild | 68 +++++ dev-python/botocore/Manifest | 8 +- dev-python/botocore/botocore-1.27.80.ebuild | 72 ----- dev-python/botocore/botocore-1.27.89.ebuild | 72 ----- dev-python/botocore/botocore-1.27.90.ebuild | 72 ----- dev-python/botocore/botocore-1.27.91.ebuild | 72 ----- dev-python/botocore/botocore-1.27.92.ebuild | 72 ----- dev-python/botocore/botocore-1.27.93.ebuild | 72 ----- dev-python/botocore/botocore-1.27.95.ebuild | 72 ----- dev-python/botocore/botocore-1.28.0.ebuild | 72 +++++ dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild | 61 ----- dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild | 62 +++++ dev-python/canonicaljson/Manifest | 1 - .../canonicaljson/canonicaljson-1.6.2.ebuild | 26 -- .../canonicaljson/canonicaljson-1.6.3.ebuild | 2 +- dev-python/colorama/Manifest | 1 + dev-python/colorama/colorama-0.4.6.ebuild | 50 ++++ dev-python/cssselect2/Manifest | 1 - dev-python/cssselect2/cssselect2-0.6.0.ebuild | 33 --- dev-python/cssselect2/cssselect2-0.7.0.ebuild | 2 +- dev-python/flask-compress/Manifest | 1 - .../flask-compress/flask-compress-1.12.ebuild | 31 --- .../flask-compress/flask-compress-1.13.ebuild | 2 +- dev-python/flask-htmlmin/Manifest | 1 + .../flask-htmlmin/flask-htmlmin-2.2.1.ebuild | 33 +++ dev-python/fonttools/fonttools-4.37.4.ebuild | 2 +- dev-python/google-auth-oauthlib/Manifest | 1 + .../google-auth-oauthlib-0.6.0.ebuild | 39 +++ dev-python/google-auth/google-auth-2.12.0.ebuild | 2 +- dev-python/humanize/Manifest | 1 - dev-python/humanize/humanize-4.3.0.ebuild | 29 --- dev-python/humanize/humanize-4.4.0.ebuild | 2 +- dev-python/hypothesis/hypothesis-6.56.2.ebuild | 1 + dev-python/hypothesis/hypothesis-6.56.3.ebuild | 2 +- dev-python/identify/Manifest | 1 + dev-python/identify/identify-2.5.7.ebuild | 29 +++ dev-python/immutables/immutables-0.19.ebuild | 2 +- dev-python/jc/Manifest | 3 - dev-python/jc/jc-1.21.0.ebuild | 31 --- dev-python/jc/jc-1.21.2.ebuild | 31 --- dev-python/jc/jc-1.22.0.ebuild | 31 --- dev-python/jwcrypto/jwcrypto-1.4.2.ebuild | 2 +- dev-python/kgb/kgb-7.1.1.ebuild | 2 +- dev-python/lit/lit-15.0.3.ebuild | 2 +- dev-python/matplotlib/Manifest | 3 - .../matplotlib/files/matplotlib-3.5.0-test.patch | 248 ------------------ dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild | 289 --------------------- dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild | 282 -------------------- dev-python/matplotlib/matplotlib-3.5.3.ebuild | 2 +- dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild | 284 -------------------- dev-python/meson-python/meson-python-0.10.0.ebuild | 2 +- .../mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild | 2 +- dev-python/numpy/Manifest | 8 - .../files/numpy-1.21.0-no-hardcode-blasv2.patch | 53 ---- .../numpy-1.21.4-build-compiler-args-ceph.patch | 49 ---- dev-python/numpy/numpy-1.21.5.ebuild | 161 ------------ dev-python/numpy/numpy-1.22.4.ebuild | 2 +- dev-python/numpy/numpy-1.23.1.ebuild | 192 -------------- dev-python/numpy/numpy-1.23.3.ebuild | 2 +- dev-python/pandas/Manifest | 1 - dev-python/pandas/pandas-1.4.4.ebuild | 198 -------------- dev-python/pandas/pandas-1.5.0-r1.ebuild | 2 +- dev-python/pandas/pandas-1.5.0.ebuild | 2 +- dev-python/peewee/Manifest | 1 - dev-python/peewee/peewee-3.15.2.ebuild | 41 --- dev-python/peewee/peewee-3.15.3.ebuild | 2 +- dev-python/priority/metadata.xml | 1 + dev-python/priority/priority-1.3.0-r1.ebuild | 2 +- dev-python/priority/priority-1.3.0.ebuild | 28 -- dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild | 2 +- dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild | 2 +- .../pyproject-metadata-0.6.1.ebuild | 2 +- dev-python/pytest-env/pytest-env-0.8.1.ebuild | 8 +- dev-python/pytest-httpserver/Manifest | 1 - .../pytest-httpserver-1.0.5.ebuild | 39 --- .../pytest-httpserver-1.0.6.ebuild | 2 +- dev-python/python-ldap/python-ldap-3.4.3.ebuild | 2 +- .../python-nbxmpp/python-nbxmpp-3.2.4.ebuild | 2 +- dev-python/python-xlib/python-xlib-0.31-r1.ebuild | 2 +- dev-python/python-xlib/python-xlib-0.31.ebuild | 38 --- .../files/pytoolconfig-1.2.2-fix-licence.patch | 21 ++ .../pytoolconfig/pytoolconfig-1.2.2-r1.ebuild | 40 +++ dev-python/qtawesome/Manifest | 1 + dev-python/qtawesome/qtawesome-1.2.1.ebuild | 39 +++ dev-python/rapidfuzz/Manifest | 1 + dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild | 47 ++++ dev-python/regex/regex-2022.9.13.ebuild | 2 +- dev-python/requests-toolbelt/Manifest | 1 + .../requests-toolbelt-0.10.1.ebuild | 52 ++++ dev-python/scipy/scipy-1.9.2.ebuild | 2 +- .../setuptools-rust/setuptools-rust-1.5.2.ebuild | 2 +- dev-python/spur/spur-0.3.22-r1.ebuild | 2 +- dev-python/spur/spur-0.3.22.ebuild | 39 --- dev-python/tenacity/Manifest | 1 - dev-python/tenacity/tenacity-8.0.1-r1.ebuild | 41 --- dev-python/tenacity/tenacity-8.1.0.ebuild | 2 +- dev-python/textdistance/textdistance-4.5.0.ebuild | 2 +- dev-python/ujson/ujson-5.5.0.ebuild | 2 +- dev-python/uvloop/uvloop-0.17.0.ebuild | 2 +- dev-python/zope-hookable/zope-hookable-5.2.ebuild | 2 +- 114 files changed, 607 insertions(+), 3491 deletions(-) delete mode 100644 dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild delete mode 100644 dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild delete mode 100644 dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild delete mode 100644 dev-python/boto3/boto3-1.24.80.ebuild delete mode 100644 dev-python/boto3/boto3-1.24.89.ebuild delete mode 100644 dev-python/boto3/boto3-1.24.90.ebuild delete mode 100644 dev-python/boto3/boto3-1.24.91.ebuild delete mode 100644 dev-python/boto3/boto3-1.24.92.ebuild delete mode 100644 dev-python/boto3/boto3-1.24.93.ebuild delete mode 100644 dev-python/boto3/boto3-1.24.95.ebuild create mode 100644 dev-python/boto3/boto3-1.25.0.ebuild delete mode 100644 dev-python/botocore/botocore-1.27.80.ebuild delete mode 100644 dev-python/botocore/botocore-1.27.89.ebuild delete mode 100644 dev-python/botocore/botocore-1.27.90.ebuild delete mode 100644 dev-python/botocore/botocore-1.27.91.ebuild delete mode 100644 dev-python/botocore/botocore-1.27.92.ebuild delete mode 100644 dev-python/botocore/botocore-1.27.93.ebuild delete mode 100644 dev-python/botocore/botocore-1.27.95.ebuild create mode 100644 dev-python/botocore/botocore-1.28.0.ebuild delete mode 100644 dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild create mode 100644 dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild delete mode 100644 dev-python/canonicaljson/canonicaljson-1.6.2.ebuild create mode 100644 dev-python/colorama/colorama-0.4.6.ebuild delete mode 100644 dev-python/cssselect2/cssselect2-0.6.0.ebuild delete mode 100644 dev-python/flask-compress/flask-compress-1.12.ebuild create mode 100644 dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild create mode 100644 dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild delete mode 100644 dev-python/humanize/humanize-4.3.0.ebuild create mode 100644 dev-python/identify/identify-2.5.7.ebuild delete mode 100644 dev-python/jc/jc-1.21.0.ebuild delete mode 100644 dev-python/jc/jc-1.21.2.ebuild delete mode 100644 dev-python/jc/jc-1.22.0.ebuild delete mode 100644 dev-python/matplotlib/files/matplotlib-3.5.0-test.patch delete mode 100644 dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild delete mode 100644 dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch delete mode 100644 dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch delete mode 100644 dev-python/numpy/numpy-1.21.5.ebuild delete mode 100644 dev-python/numpy/numpy-1.23.1.ebuild delete mode 100644 dev-python/pandas/pandas-1.4.4.ebuild delete mode 100644 dev-python/peewee/peewee-3.15.2.ebuild delete mode 100644 dev-python/priority/priority-1.3.0.ebuild delete mode 100644 dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild delete mode 100644 dev-python/python-xlib/python-xlib-0.31.ebuild create mode 100644 dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch create mode 100644 dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild create mode 100644 dev-python/qtawesome/qtawesome-1.2.1.ebuild create mode 100644 dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild create mode 100644 dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild delete mode 100644 dev-python/spur/spur-0.3.22.ebuild delete mode 100644 dev-python/tenacity/tenacity-8.0.1-r1.ebuild (limited to 'dev-python') diff --git a/dev-python/aiohttp/aiohttp-3.8.3.ebuild b/dev-python/aiohttp/aiohttp-3.8.3.ebuild index 25b983ffb235..91c01595d43a 100644 --- a/dev-python/aiohttp/aiohttp-3.8.3.ebuild +++ b/dev-python/aiohttp/aiohttp-3.8.3.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86" IUSE="test-rust" RDEPEND=" diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest index 79143504b5d9..1ddd70e919f1 100644 --- a/dev-python/aws-sam-translator/Manifest +++ b/dev-python/aws-sam-translator/Manifest @@ -1,4 +1 @@ -DIST aws-sam-translator-1.50.0.gh.tar.gz 1103467 BLAKE2B 8d9408b7e92a5c515da47075a0722c937223e73dfa99d92d6daf91997a2edf4e1854afb88f7020fdab3457453d1c54ea77cf7e3466ec71ede36bfb3fc9c469fa SHA512 2f8f494218a1ac018893de59e7bede88b73ce446b29cc818d9309275851b080608656f69c422a9b49c885a6e6cbe7f34826f31cf4da9f2ee0667a1663dbee32a -DIST aws-sam-translator-1.51.0.gh.tar.gz 1107033 BLAKE2B be5d46fa4caa7619c0b959eeec65d0902fdb197369c84c930618398a9b4110c2b1e281c80e63c659be266bb6b2f191495c40578fde73ab31c93bd05906bd55e3 SHA512 d21f3d0b3d4947ad25811f0274e5807089a8d1e2aab76310a80a92f48cfe9ac683bcecea3c833692948f94934be5662cf7585aab0a4a949fcf368901d2e1b9a8 -DIST aws-sam-translator-1.52.0.gh.tar.gz 1155351 BLAKE2B 523b7b8b31ee001da05b43a1a9ca17da30d3a4a63ebfefdd7dcb9e4a67088f8b6d51da3eefa241e4330bf901a7cd3544094d58b1b512fb8d967198a7d7b92ab0 SHA512 d6108086143d76bce810ec0276763dac944381ad22bb89f8ed5ed5197168bf9139808c5177655c6d59b57017b398cb8220acfb69d14d25883753e3b695b456f4 DIST aws-sam-translator-1.53.0.gh.tar.gz 1158682 BLAKE2B 4bc8430936a1b180dc04637e540ecad7eb82cd7a5da5254f2b823075878a03ad3e63422c183b365b0dad927bcdf063b8ab40984ab23abe1d91d8bc3c411aa2f1 SHA512 292259bf8d4002b72be51db0358673eee61fe368be5db15e7faff195baae8fa194bef882fd0f5a9b5c46379fe5f9593d101a212121da8d0636aca709dd087f05 diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild deleted file mode 100644 index 25619093ae5f..000000000000 --- a/dev-python/aws-sam-translator/aws-sam-translator-1.50.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 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} ) - -inherit distutils-r1 - -DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates" -HOMEPAGE=" - https://github.com/aws/serverless-application-model/ - https://pypi.org/project/aws-sam-translator/ -" -SRC_URI=" - https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" -S="${WORKDIR}/serverless-application-model-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - =dev-python/boto3-1.19.5[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri - tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2 - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls -) - -python_prepare_all() { - # remove pytest-cov dependency - sed -i -e '/addopts/d' pytest.ini || die - - # deps are installed by ebuild, don't try to reinstall them via pip - truncate --size=0 requirements/*.txt || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild deleted file mode 100644 index efb58ee46300..000000000000 --- a/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 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} ) - -inherit distutils-r1 - -DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates" -HOMEPAGE=" - https://github.com/aws/serverless-application-model/ - https://pypi.org/project/aws-sam-translator/ -" -SRC_URI=" - https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" -S="${WORKDIR}/serverless-application-model-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - =dev-python/boto3-1.19.5[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri - tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2 - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls -) - -python_prepare_all() { - # remove pytest-cov dependency - sed -i -e '/addopts/d' pytest.ini || die - - # deps are installed by ebuild, don't try to reinstall them via pip - truncate --size=0 requirements/*.txt || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild deleted file mode 100644 index efb58ee46300..000000000000 --- a/dev-python/aws-sam-translator/aws-sam-translator-1.52.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 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} ) - -inherit distutils-r1 - -DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates" -HOMEPAGE=" - https://github.com/aws/serverless-application-model/ - https://pypi.org/project/aws-sam-translator/ -" -SRC_URI=" - https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" -S="${WORKDIR}/serverless-application-model-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - =dev-python/boto3-1.19.5[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri - tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2 - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing - tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls -) - -python_prepare_all() { - # remove pytest-cov dependency - sed -i -e '/addopts/d' pytest.ini || die - - # deps are installed by ebuild, don't try to reinstall them via pip - truncate --size=0 requirements/*.txt || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild index efb58ee46300..25619093ae5f 100644 --- a/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild +++ b/dev-python/aws-sam-translator/aws-sam-translator-1.53.0.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/serverless-application-model-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" RDEPEND=" =.*':':" 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 - ) - - epytest tests/{functional,unit} -n "$(makeopts_jobs)" -} diff --git a/dev-python/botocore/botocore-1.27.89.ebuild b/dev-python/botocore/botocore-1.27.89.ebuild deleted file mode 100644 index ba4830d69cb3..000000000000 --- a/dev-python/botocore/botocore-1.27.89.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 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} ) - -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/urllib3-1.25.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs/source \ - 'dev-python/guzzle_sphinx_theme' -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 - ) - - epytest tests/{functional,unit} -n "$(makeopts_jobs)" -} diff --git a/dev-python/botocore/botocore-1.27.90.ebuild b/dev-python/botocore/botocore-1.27.90.ebuild deleted file mode 100644 index ba4830d69cb3..000000000000 --- a/dev-python/botocore/botocore-1.27.90.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 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} ) - -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/urllib3-1.25.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs/source \ - 'dev-python/guzzle_sphinx_theme' -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 - ) - - epytest tests/{functional,unit} -n "$(makeopts_jobs)" -} diff --git a/dev-python/botocore/botocore-1.27.91.ebuild b/dev-python/botocore/botocore-1.27.91.ebuild deleted file mode 100644 index ba4830d69cb3..000000000000 --- a/dev-python/botocore/botocore-1.27.91.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 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} ) - -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/urllib3-1.25.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs/source \ - 'dev-python/guzzle_sphinx_theme' -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 - ) - - epytest tests/{functional,unit} -n "$(makeopts_jobs)" -} diff --git a/dev-python/botocore/botocore-1.27.92.ebuild b/dev-python/botocore/botocore-1.27.92.ebuild deleted file mode 100644 index ba4830d69cb3..000000000000 --- a/dev-python/botocore/botocore-1.27.92.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 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} ) - -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/urllib3-1.25.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs/source \ - 'dev-python/guzzle_sphinx_theme' -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 - ) - - epytest tests/{functional,unit} -n "$(makeopts_jobs)" -} diff --git a/dev-python/botocore/botocore-1.27.93.ebuild b/dev-python/botocore/botocore-1.27.93.ebuild deleted file mode 100644 index ba4830d69cb3..000000000000 --- a/dev-python/botocore/botocore-1.27.93.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 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} ) - -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/urllib3-1.25.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs/source \ - 'dev-python/guzzle_sphinx_theme' -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 - ) - - epytest tests/{functional,unit} -n "$(makeopts_jobs)" -} diff --git a/dev-python/botocore/botocore-1.27.95.ebuild b/dev-python/botocore/botocore-1.27.95.ebuild deleted file mode 100644 index ba4830d69cb3..000000000000 --- a/dev-python/botocore/botocore-1.27.95.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 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} ) - -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/urllib3-1.25.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_sphinx docs/source \ - 'dev-python/guzzle_sphinx_theme' -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 - ) - - epytest tests/{functional,unit} -n "$(makeopts_jobs)" -} diff --git a/dev-python/botocore/botocore-1.28.0.ebuild b/dev-python/botocore/botocore-1.28.0.ebuild new file mode 100644 index 000000000000..ba4830d69cb3 --- /dev/null +++ b/dev-python/botocore/botocore-1.28.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 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} ) + +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/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +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 + ) + + epytest tests/{functional,unit} -n "$(makeopts_jobs)" +} diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild deleted file mode 100644 index 2df0cd1828a9..000000000000 --- a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 ) - -inherit distutils-r1 - -# Commit of the Brotli library bundled within brotlipy. -BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7" - -DESCRIPTION="Python binding to the Brotli library" -HOMEPAGE=" - https://github.com/python-hyper/brotlicffi/ - https://pypi.org/project/brotlicffi/ -" -SRC_URI=" - https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz - test? ( - https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz - -> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz - ) -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - app-arch/brotli:= - $(python_gen_cond_dep ' - dev-python/cffi[${PYTHON_USEDEP}] - ' 'python*') -" -DEPEND=" - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # incompatible with USE_SHARED_BROTLI=1 - test/test_compatibility.py::test_brotli_version -) - -src_unpack() { - default - if use test; then - mv "brotli-${BROTLI_BUNDLED_COMMIT}"/tests "${S}"/libbrotli/ || die - fi -} - -src_configure() { - export USE_SHARED_BROTLI=1 -} diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild new file mode 100644 index 000000000000..50f4c0cdf54a --- /dev/null +++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 ) + +inherit distutils-r1 + +# Commit of the Brotli library bundled within brotlipy. +BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7" + +DESCRIPTION="Python binding to the Brotli library" +HOMEPAGE=" + https://github.com/python-hyper/brotlicffi/ + https://pypi.org/project/brotlicffi/ +" +SRC_URI=" + https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + test? ( + https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz + -> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz + ) +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + app-arch/brotli:= + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') +" +DEPEND=" + ${RDEPEND} + test? ( + dev-python/hypothesis[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +EPYTEST_DESELECT=( + # incompatible with USE_SHARED_BROTLI=1 + test/test_compatibility.py::test_brotli_version +) + +src_unpack() { + default + if use test; then + mv "brotli-${BROTLI_BUNDLED_COMMIT}"/tests "${S}"/libbrotli/ || die + fi +} + +src_configure() { + export USE_SHARED_BROTLI=1 +} diff --git a/dev-python/canonicaljson/Manifest b/dev-python/canonicaljson/Manifest index 29134e904a50..3c36ae0e100a 100644 --- a/dev-python/canonicaljson/Manifest +++ b/dev-python/canonicaljson/Manifest @@ -1,2 +1 @@ -DIST canonicaljson-1.6.2.gh.tar.gz 10311 BLAKE2B 7460b99d8e95b223e4d092ee4158c13b5b101d7001fe111fed021c15128d040ef657ee03dbfba14d2e3df0a61f82a072e171a87312f47f524baad1603c6e47bb SHA512 5dfcf76e80814e65b897e216e18cbe69b3f44e7676fe433cefdcfa15dc18a004dc7586c16bf95b7457cb8e9268dedf2e7b1b92247b7c65afef30888b1c89bde5 DIST canonicaljson-1.6.3.gh.tar.gz 10400 BLAKE2B 9d97ad9f8c0803fdfd1f4d2f85291fb175d19be23fb9c3bdf717030b9dae30f810329118c484cdf9dab5d77f01ea41b08653559fa188c90305126bdf3f4e5f9d SHA512 4b2cb7524425b8a4dde2359273f60110ca01081d31b0add158f106ff1f8874366978d6a15baed53a948503d4013b87a0b75ad7f6e8ea6ce42f3f9fc95672280f diff --git a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild deleted file mode 100644 index 0328a8385eff..000000000000 --- a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2022 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} ) - -inherit distutils-r1 - -DESCRIPTION="Canonical JSON" -HOMEPAGE=" - https://github.com/matrix-org/python-canonicaljson/ - https://pypi.org/project/canonicaljson/ -" -SRC_URI="https://github.com/matrix-org/python-canonicaljson/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -S="${WORKDIR}/python-${P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~ppc64" - -RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]" - -distutils_enable_tests unittest diff --git a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild index 428b81508658..31dd6cf67b7c 100644 --- a/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild +++ b/dev-python/canonicaljson/canonicaljson-1.6.3.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/python-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]" diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest index 622ffbf04ee6..d6c1dbae9c4b 100644 --- a/dev-python/colorama/Manifest +++ b/dev-python/colorama/Manifest @@ -1 +1,2 @@ DIST colorama-0.4.5.gh.tar.gz 113373 BLAKE2B d7b071b1efa585c26c48f26af7a0df9bff25e3986f2615889fd25c34d785c256ac3c4655375f13e7d1bc6972f7fa64bd48a819d988160ceb75fda356d645876d SHA512 d4d3b2a4c6a0966b5c15a12cd789e4b68e5b632c4d745d93fcff5e250fe10e5d45dd2a8bd25f4399cca31a358aecf99f354aa3e1b74369ae382b51bd6c87644f +DIST colorama-0.4.6.gh.tar.gz 116300 BLAKE2B 5b8f013a0cfa227dc750456d28af83dd6322000a3982e680d0cf051f6ae964b630f2889a0f1b78fe1cab465b25a52db07516cee9cbd99575dae38a86c5b69bd0 SHA512 2b269b190041398a1808b0b5147e47422b4451a1bc91841d0957572214ba8addd731c8932afdc60bfbba9833a0fe6c9c5c2ecb150613f13498f661799d625e4f diff --git a/dev-python/colorama/colorama-0.4.6.ebuild b/dev-python/colorama/colorama-0.4.6.ebuild new file mode 100644 index 000000000000..8cd991c51f41 --- /dev/null +++ b/dev-python/colorama/colorama-0.4.6.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 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} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning" +HOMEPAGE=" + https://pypi.org/project/colorama/ + https://github.com/tartley/colorama/ +" +SRC_URI=" + https://github.com/tartley/colorama/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="examples" + +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_install_all() { + distutils-r1_python_install_all + + if use examples; then + docinto examples + dodoc -r demos/. + docompress -x /usr/share/doc/${PF}/examples + fi +} + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + # Some tests require stdout to be a TTY + # https://github.com/tartley/colorama/issues/169 + script -eqc "${EPYTHON} -m pytest -vv -s" /dev/null \ + || die "tests failed with ${EPYTHON}" +} diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest index 46871f23cceb..00dfaa7607e4 100644 --- a/dev-python/cssselect2/Manifest +++ b/dev-python/cssselect2/Manifest @@ -1,2 +1 @@ -DIST cssselect2-0.6.0.tar.gz 35442 BLAKE2B eb42c6abed531d9ece07ae5aa442be0c0ca926f982987ede1c5ba3e391950fcf88b1c322da5933842993ad5d98488e2a29aa714d1ca65b672cecbe425bac9bd7 SHA512 10cb55ebaaa16b755d85f1e511ae0281fb017d6937750392ae1da7f32d51ff944fb14c6d1c9ea5f42734450b719157ded116dc14ef471a9a20fcc43fb6682308 DIST cssselect2-0.7.0.tar.gz 35888 BLAKE2B 14ad79878b7dbd9ce56fa9597a0678b3dc774fc81f599cd8eb28d67af5eb07914ff6f72dd6210d1e34787c78f85ebb22c8096c3a642f1c0092384e4f22a9e59c SHA512 e3c975fe159d3bec53002bda31c72d9cb346f40529272d8d5bef6aa13142ce60f1e8aa20b039d93ff5ff3d2cd34119b8b2d406f889964eded69e770e4f04e949 diff --git a/dev-python/cssselect2/cssselect2-0.6.0.ebuild b/dev-python/cssselect2/cssselect2-0.6.0.ebuild deleted file mode 100644 index 17111079b3ce..000000000000 --- a/dev-python/cssselect2/cssselect2-0.6.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -inherit distutils-r1 - -DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0" -HOMEPAGE=" - https://doc.courtbouillon.org/cssselect2/stable/ - https://pypi.org/project/cssselect2/ - https://github.com/Kozea/cssselect2/ -" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" - -RDEPEND=" - dev-python/tinycss2[${PYTHON_USEDEP}] - dev-python/webencodings[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/addopts/d' pyproject.toml || die - distutils-r1_src_prepare -} diff --git a/dev-python/cssselect2/cssselect2-0.7.0.ebuild b/dev-python/cssselect2/cssselect2-0.7.0.ebuild index 80f683f41037..17111079b3ce 100644 --- a/dev-python/cssselect2/cssselect2-0.7.0.ebuild +++ b/dev-python/cssselect2/cssselect2-0.7.0.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" RDEPEND=" dev-python/tinycss2[${PYTHON_USEDEP}] diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest index 2e8c64992fa7..971adc2af34c 100644 --- a/dev-python/flask-compress/Manifest +++ b/dev-python/flask-compress/Manifest @@ -1,2 +1 @@ -DIST Flask-Compress-1.12.tar.gz 12581 BLAKE2B 5c925c19756730beaf5ac24b492e8bffcf7dd7c80df3c8440a8dfeca67e9756c50839246081b01b2da8c4b05839ee35b21b30f8e007734bbfcc1f056770ef3de SHA512 5712aff44aaaa379656e03f7b63fdef727721245cb9329e698a2e25aefca21a77202f5eb0c5f5828395647c694a5b417778a7b5db9eb592753a979d3994603a5 DIST Flask-Compress-1.13.tar.gz 12675 BLAKE2B 252c63500e5ba2adbe857a52fcffe2dc8280198c79210d64ae8439c8e0daaeaa4e295002a5fdacb6724971018f7e3322c00bab85bfd0ad2291f53103f01f3ee1 SHA512 e910971f94966f14d4657f7fa1c92a4e73ca7afd08959ed5d5694228851f06e614873f3202d19c6a06be2c277136f097d88eb578773dd7b5e9130456c9828ed0 diff --git a/dev-python/flask-compress/flask-compress-1.12.ebuild b/dev-python/flask-compress/flask-compress-1.12.ebuild deleted file mode 100644 index 4cbfc3430126..000000000000 --- a/dev-python/flask-compress/flask-compress-1.12.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2022 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} ) - -inherit distutils-r1 - -MY_PN="Flask-Compress" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Compress responses in your Flask app with gzip" -HOMEPAGE=" - https://github.com/colour-science/flask-compress/ - https://pypi.org/project/Flask-Compress/ -" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - app-arch/brotli[python,${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/dev-python/flask-compress/flask-compress-1.13.ebuild b/dev-python/flask-compress/flask-compress-1.13.ebuild index 24a448027b65..4cbfc3430126 100644 --- a/dev-python/flask-compress/flask-compress-1.13.ebuild +++ b/dev-python/flask-compress/flask-compress-1.13.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" app-arch/brotli[python,${PYTHON_USEDEP}] diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest index c299eb8e264e..dd4c6f1b4626 100644 --- a/dev-python/flask-htmlmin/Manifest +++ b/dev-python/flask-htmlmin/Manifest @@ -1 +1,2 @@ DIST Flask-HTMLmin-2.2.0.gh.tar.gz 17637 BLAKE2B 541ae212ba5bfd5e5881adb108d62c994248a7f851512d0fddedb001737620433cb46e267cdd66de73a353c6b357802eb89ea33c771153bc0acf3937c06f83c3 SHA512 24287ef93e99a16e7dde35ba6b7b8fefa06f11ce30fb47969313c3e0e1135ac8a2685aac06bc430d3253162f4f2bc7e8eed90ddda2092bbad092d4e0d09cb4fc +DIST Flask-HTMLmin-2.2.1.gh.tar.gz 17550 BLAKE2B 30393f6739ba8bdcfc17586e0955dff4341707b3c5bc27e30e9f9ddd5d4ff5b5b1b71b512b034b3b09cab3bfbcfb47c1651bc8cedba597de8aca5f2c7cfc0907 SHA512 34d5c9e2393901b32ab43c4333d87d75b489a410af2fdb019c180d0cb7bac01074616125486b49ef577782311a394bde6444ce311d5ab4f2ae2852a3ea92f4cd diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild new file mode 100644 index 000000000000..2510fcb5370a --- /dev/null +++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 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} ) + +inherit distutils-r1 + +MY_P="Flask-HTMLmin-${PV}" +DESCRIPTION="Minimize your flask rendered html" +HOMEPAGE=" + https://github.com/hamidfzm/Flask-HTMLmin/ + https://pypi.org/project/Flask-HTMLmin/ +" +SRC_URI=" + https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + app-text/cssmin[${PYTHON_USEDEP}] + app-text/htmlmin[${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/dev-python/fonttools/fonttools-4.37.4.ebuild b/dev-python/fonttools/fonttools-4.37.4.ebuild index 520e536cf49e..4c0890fa1f12 100644 --- a/dev-python/fonttools/fonttools-4.37.4.ebuild +++ b/dev-python/fonttools/fonttools-4.37.4.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" RDEPEND=" >=dev-python/fs-2.4.9[${PYTHON_USEDEP}] diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest index 172afb57e808..1810ea684410 100644 --- a/dev-python/google-auth-oauthlib/Manifest +++ b/dev-python/google-auth-oauthlib/Manifest @@ -1,2 +1,3 @@ DIST google-auth-library-python-oauthlib-0.5.2.gh.tar.gz 53842 BLAKE2B 7adcd9f339ec9a5528308fcc0fee1cbbe96440e1bfe5c7cc9c94808668e22801b612d291a2419333888194c3224838ac40f9d0656381825bd660067470f58910 SHA512 eaf296a0e0504e8249637a8db7531c10b120f28abeeab3e1fe8f366b4279c396509188e83f8a0ec56be85063430ceb691d6d926cee33d4f166bbcc4425e538db DIST google-auth-library-python-oauthlib-0.5.3.gh.tar.gz 69613 BLAKE2B 74338894f35fd1cd8802ea56952561ce0e801fecb2f994b71caf3c6b62a22e8b85f8a5b40f5571b05225a565b373865377d321625aeea2dafcc0cafb89da1492 SHA512 76c855e9becd57d3cb3bb0b203ad77ef17dc04e8be8b96d17a9c1f29474a8b180edb725e835d0552c5eddbb387cc463e88b076dd6d11635e6d45798224f09188 +DIST google-auth-library-python-oauthlib-0.6.0.gh.tar.gz 70025 BLAKE2B 2d87390a629d967b0f2aef5f56712d3defc2b460a67f2bf633bb628875161f9ddbb4f229426ce2b42dcf805feefe8101ed3bacd72ced630c0be4fe40bd926c7e SHA512 1aa42498a5875812db922b30eb20cdf124935f95f5cabd224acfb82c9ed61714cfc3c6af2168e75cf11aaa8550e41c48f30fc1d467d1b7be511bf5cb522104e8 diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild new file mode 100644 index 000000000000..60fc3fc45a6c --- /dev/null +++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.6.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 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} ) + +inherit distutils-r1 + +MY_P=google-auth-library-python-oauthlib-${PV} +DESCRIPTION="Google Authentication Library" +HOMEPAGE=" + https://github.com/googleapis/google-auth-library-python-oauthlib/ + https://pypi.org/project/google-auth-oauthlib/ +" +SRC_URI=" + https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/click-6.0.0[${PYTHON_USEDEP}] + >=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}] + >=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}] +" + +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/dev-python/google-auth/google-auth-2.12.0.ebuild b/dev-python/google-auth/google-auth-2.12.0.ebuild index b54cee0615a6..eacb2920974f 100644 --- a/dev-python/google-auth/google-auth-2.12.0.ebuild +++ b/dev-python/google-auth/google-auth-2.12.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" RDEPEND=" -Date: Fri, 26 Mar 2021 13:42:49 +0100 -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 | 4 ++-- - lib/matplotlib/tests/test_backend_pgf.py | 2 +- - lib/matplotlib/tests/test_contour.py | 2 +- - lib/matplotlib/tests/test_figure.py | 5 +++-- - 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/mpl_toolkits/tests/test_axes_grid1.py | 2 +- - lib/mpl_toolkits/tests/test_mplot3d.py | 2 +- - 12 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 17f8e5c631..b44cd454ef 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -868,7 +868,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 - # use former defaults to match existing baseline image -@@ -4163,7 +4163,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 9b5b0b28ee..a374be0333 100644 ---- a/lib/matplotlib/tests/test_backend_pgf.py -+++ b/lib/matplotlib/tests/test_backend_pgf.py -@@ -80,7 +80,7 @@ def test_common_texification(plain_text, escaped_text): - # test compiling a figure to pdf with xelatex - @needs_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_contour.py b/lib/matplotlib/tests/test_contour.py -index 6396105f12..45b7022d03 100644 ---- a/lib/matplotlib/tests/test_contour.py -+++ b/lib/matplotlib/tests/test_contour.py -@@ -341,7 +341,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.1) - # 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 cb8f63893a..ef56c50d25 100644 ---- a/lib/matplotlib/tests/test_figure.py -+++ b/lib/matplotlib/tests/test_figure.py -@@ -23,7 +23,7 @@ import matplotlib.gridspec as gridspec - - - @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(tight_layout=True) - gs = gridspec.GridSpec(3, 3) -@@ -1000,7 +1000,8 @@ def test_subfigure_tightbbox(): - - @image_comparison(['test_subfigure_ss.png'], style='mpl20', - savefig_kwarg={'facecolor': 'teal'}, -- remove_text=False) -+ remove_text=False, -+ tol=0.013) - def test_subfigure_ss(): - # test assigning the subfigure via subplotspec - np.random.seed(19680801) -diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py -index 719b190578..ee2263a88e 100644 ---- a/lib/matplotlib/tests/test_image.py -+++ b/lib/matplotlib/tests/test_image.py -@@ -1324,7 +1324,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 21c8ab748d..a05cb4c571 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -102,7 +102,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) -@@ -111,7 +111,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) -@@ -137,7 +137,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 f6917a134b..4a14abb74d 100644 ---- a/lib/matplotlib/tests/test_lines.py -+++ b/lib/matplotlib/tests/test_lines.py -@@ -162,7 +162,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.58) - 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 88c3ec2768..b536ba3ff0 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 a6f6b44c97..ab5ad8b5cf 100644 ---- a/lib/matplotlib/tests/test_units.py -+++ b/lib/matplotlib/tests/test_units.py -@@ -76,7 +76,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'], remove_text=False, 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 -@@ -103,7 +103,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/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py -index 3c4aa9a9eb..94ad419ceb 100644 ---- a/lib/mpl_toolkits/tests/test_axes_grid1.py -+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py -@@ -324,7 +324,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') -diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py -index 5fee82f519..ed55a7bf68 100644 ---- a/lib/mpl_toolkits/tests/test_mplot3d.py -+++ b/lib/mpl_toolkits/tests/test_mplot3d.py -@@ -1357,7 +1357,7 @@ def test_errorbar3d(): - - - @image_comparison(['stem3d.png'], style='mpl20', -- tol=0.0 if platform.machine() == 'x86_64' else 0.003) -+ tol=0.003) - def test_stem3d(): - fig, axs = plt.subplots(2, 3, figsize=(8, 6), - constrained_layout=True, --- -2.34.0 - diff --git a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild deleted file mode 100644 index 6141d34f1267..000000000000 --- a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix - -FT_PV=2.6.1 -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE="https://matplotlib.org/" -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="amd64 arm arm64 hppa ~ia64 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/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.18.2[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,${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}] - >=dev-python/six-1.14.0[${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? ( - dev-python/wxpython:*[${PYTHON_USEDEP}] - ) -" - -BDEPEND=" - ${RDEPEND} - dev-python/setuptools_scm[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${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/flaky[${PYTHON_USEDEP}] - dev-python/mock[${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] - ) -" - -# A few C++ source files are written to srcdir. -# Other than that, the ebuild shall be fit for out-of-source build. -DISTUTILS_IN_SOURCE_BUILD=1 - -distutils_enable_tests pytest - -pkg_setup() { - unset DISPLAY # bug #278524 -} - -use_supported() { - case ${1} in - wxwidgets) - [[ ${EPYTHON} == python3.[678] ]] - ;; - esac - - return 0 -} - -use_setup() { - local uword="${2:-${1}}" - if use_supported "${1}" && 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 - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - # 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.5.0-test.patch - ) - - # requires jupyter-nbconvert - rm lib/matplotlib/tests/test_backend_nbagg.py || die - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - - sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \ - -i lib/matplotlib/tests/test_*.py || die - - hprefixify setupext.py - - rm -rf libqhull || die - - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || 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 -} - -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 = $(usex test True False) - [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 --build-lib="${BUILD_DIR}"/lib -} - -python_compile_all() { - if use doc; then - cd doc || die - - # necessary for in-source build - local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} - - VARTEXFONTS="${T}"/fonts \ - emake SPHINXOPTS= O=-Dplot_formats=png:100 html - fi -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - # 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 - ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die - distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib - local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH} - - "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die -} - -python_install() { - wrap_setup distutils-r1_python_install - - # mpl_toolkits namespace - python_moduleinto mpl_toolkits - python_domodule lib/mpl_toolkits/__init__.py -} - -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 - - find "${D}" -name '*.pth' -delete || die -} diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild deleted file mode 100644 index 3a5995245ce2..000000000000 --- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild +++ /dev/null @@ -1,282 +0,0 @@ -# Copyright 1999-2022 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} ) -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="amd64 arm ~arm64 hppa ~ia64 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/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.18.2[${PYTHON_USEDEP}] - >=dev-python/packaging-20.0[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,${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}] - >=dev-python/six-1.14.0[${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[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${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 - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - # 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.5.2-test.patch - ) - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - - 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.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild index 4f443c082d72..ecaa3e760277 100644 --- a/dev-python/matplotlib/matplotlib-3.5.3.ebuild +++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild @@ -30,7 +30,7 @@ SRC_URI=" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" # internal copy of pycxx highly patched diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild deleted file mode 100644 index 13cd4d8a1686..000000000000 --- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright 1999-2022 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} ) -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" -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}] - >=dev-python/six-1.14.0[${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}] - dev-python/setuptools_scm_git_archive[${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 - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - # 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/meson-python/meson-python-0.10.0.ebuild b/dev-python/meson-python/meson-python-0.10.0.ebuild index 2ef6ebee3008..18e403f9dd11 100644 --- a/dev-python/meson-python/meson-python-0.10.0.ebuild +++ b/dev-python/meson-python/meson-python-0.10.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86" RDEPEND=" >=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}] diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild index 1f358fb1ac0b..1cb0ec97687a 100644 --- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild +++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" RDEPEND=" >=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}] diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 93d51c930fcc..becb2629a429 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,20 +1,12 @@ -DIST numpy-1.21.5.zip 10652289 BLAKE2B c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c SHA512 03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78 DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48 -DIST numpy-1.23.1.tar.gz 10716841 BLAKE2B c8b17bc6f1626a32fd62ac3e952f6ee4a5886ba9ab9721be540831d3cdb19c4ea7cefcb422b12384fd4804d12f6f4b0d8f1e0110306e426a2b92d5f98acd62f7 SHA512 b34fb627e0e548bae3cf4555c4c71ab4a170ade86a9ff4011a5dfac6aba29e2e04b1151b9364cd1efff004efc1c04b3bab111facbcdc3297f8c38d7a09c83e17 DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc SHA512 e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9 DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09 SHA512 727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8 -DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3 -DIST numpy-html-1.23.1.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a -DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1 -DIST numpy-ref-1.23.1.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a -DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1 -DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c diff --git a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch deleted file mode 100644 index 73c5cae90d00..000000000000 --- a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch +++ /dev/null @@ -1,53 +0,0 @@ -Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python/numpy/files?id=e5ce90a04e79f6413604e96e4803cb95ada7c859 -https://bugs.gentoo.org/567938 -diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 82e864a5c..1d77e5854 100644 ---- a/numpy/distutils/system_info.py -+++ b/numpy/distutils/system_info.py -@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0): - 1 - display warning message - 2 - raise error - """ -- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead -- 'atlas_threads': atlas_threads_info, # ditto -- 'atlas_blas': atlas_blas_info, -- 'atlas_blas_threads': atlas_blas_threads_info, -- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead -- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto -- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead -- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto -- 'atlas_3_10_blas': atlas_3_10_blas_info, -- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info, -- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead -- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto -- 'flame': flame_info, # use lapack_opt instead -- 'mkl': mkl_info, -- # openblas which may or may not have embedded lapack -- 'openblas': openblas_info, # use blas_opt instead -- # openblas with embedded lapack -- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead -- 'openblas_clapack': openblas_clapack_info, # use blas_opt instead -- 'blis': blis_info, # use blas_opt instead -- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead -- 'blas_mkl': blas_mkl_info, # use blas_opt instead -- 'accelerate': accelerate_info, # use blas_opt instead -- 'openblas64_': openblas64__info, -- 'openblas64__lapack': openblas64__lapack_info, -- 'openblas_ilp64': openblas_ilp64_info, -- 'openblas_ilp64_lapack': openblas_ilp64_lapack_info, -+ cl = {'flame': flame_info, # use lapack_opt instead - 'x11': x11_info, - 'fft_opt': fft_opt_info, - 'fftw': fftw_info, -@@ -947,10 +921,7 @@ def get_libs(self, key, default): - return [b for b in [a.strip() for a in libs.split(',')] if b] - - def get_libraries(self, key='libraries'): -- if hasattr(self, '_lib_names'): -- return self.get_libs(key, default=self._lib_names) -- else: -- return self.get_libs(key, '') -+ return self.get_libs(key, '') - - def library_extensions(self): - c = customized_ccompiler() diff --git a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch b/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch deleted file mode 100644 index 6a31d2efe970..000000000000 --- a/dev-python/numpy/files/numpy-1.21.4-build-compiler-args-ceph.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://github.com/numpy/numpy/commit/689d905f501b7abbddf0fdef241fa586a83e5cd6 -https://github.com/numpy/numpy/pull/20116 -https://bugs.gentoo.org/802150 - -From 7dcf62379f41407d8f9583d1c2016e3d8ec48384 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Thu, 14 Oct 2021 14:58:52 +0900 -Subject: [PATCH] MAINT: Fix issue with C compiler args containing spaces - -Instead of doing a dumb string split, use shlex to make sure args -containing spaces are handled properly. ---- - numpy/distutils/unixccompiler.py | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py -index 733a9fc5094..4884960fdf2 100644 ---- a/numpy/distutils/unixccompiler.py -+++ b/numpy/distutils/unixccompiler.py -@@ -5,6 +5,7 @@ - import os - import sys - import subprocess -+import shlex - - from distutils.errors import CompileError, DistutilsExecError, LibError - from distutils.unixccompiler import UnixCCompiler -@@ -30,15 +31,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts - if 'OPT' in os.environ: - # XXX who uses this? - from sysconfig import get_config_vars -- opt = " ".join(os.environ['OPT'].split()) -- gcv_opt = " ".join(get_config_vars('OPT')[0].split()) -- ccomp_s = " ".join(self.compiler_so) -+ opt = shlex.join(shlex.split(os.environ['OPT'])) -+ gcv_opt = shlex.join(shlex.split(get_config_vars('OPT')[0])) -+ ccomp_s = shlex.join(self.compiler_so) - if opt not in ccomp_s: - ccomp_s = ccomp_s.replace(gcv_opt, opt) -- self.compiler_so = ccomp_s.split() -- llink_s = " ".join(self.linker_so) -+ self.compiler_so = shlex.split(ccomp_s) -+ llink_s = shlex.join(self.linker_so) - if opt not in llink_s: -- self.linker_so = llink_s.split() + opt.split() -+ self.linker_so = self.linker_so + shlex.split(opt) - - display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) - diff --git a/dev-python/numpy/numpy-1.21.5.ebuild b/dev-python/numpy/numpy-1.21.5.ebuild deleted file mode 100644 index d7b560fb3708..000000000000 --- a/dev-python/numpy/numpy-1.21.5.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="threads(+)" - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs - -DOC_PV=${PV} -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="https://numpy.org/" -SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${P}.zip - doc? ( - https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip - https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf - https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf - )" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack" - -RDEPEND=" - lapack? ( - >=virtual/cblas-3.8 - >=virtual/lapack-3.8 - ) -" -BDEPEND=" - ${RDEPEND} - app-arch/unzip - >=dev-python/cython-0.29.24[${PYTHON_USEDEP}] - lapack? ( virtual/pkgconfig ) - test? ( - >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch - "${FILESDIR}"/numpy-1.21.4-build-compiler-args-ceph.patch -) - -distutils_enable_tests pytest - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die - fi -} - -python_prepare_all() { - if use lapack; then - local incdir="${EPREFIX}"/usr/include - local libdir="${EPREFIX}"/usr/$(get_libdir) - cat >> site.cfg <<-EOF || die - [blas] - include_dirs = ${incdir} - library_dirs = ${libdir} - blas_libs = cblas,blas - [lapack] - library_dirs = ${libdir} - lapack_libs = lapack - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die - - # disable fuzzed tests - find numpy/*/tests -name '*.py' -exec sed -i \ - -e 's:def \(.*_fuzz\):def _\1:' {} + || die - # very memory- and disk-hungry - sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - export MAKEOPTS=-j1 #660754 - - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - local deselect=( - numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py] - ) - - if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then - # Degenerate case. arm32 chroot on arm64. - # bug #774108 - deselect+=( - numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features - ) - fi - - if use x86 ; then - deselect+=( - # https://github.com/numpy/numpy/issues/18388 - numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow - # https://github.com/numpy/numpy/issues/18387 - numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto - ) - fi - - distutils_install_for_testing --single-version-externally-managed \ - --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} - - cd "${TEST_DIR}/lib" || die - epytest ${deselect[@]/#/--deselect } -} - -python_install() { - # https://github.com/numpy/numpy/issues/16005 - local mydistutilsargs=( build_src ) - distutils-r1_python_install ${NUMPY_FCONFIG} - python_optimize -} - -python_install_all() { - local DOCS=( LICENSE.txt README.md THANKS.txt ) - - if use doc; then - local HTML_DOCS=( "${WORKDIR}"/html/. ) - DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) - fi - - distutils-r1_python_install_all -} diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild index 3b6f3e0c42b5..79067cec4dd3 100644 --- a/dev-python/numpy/numpy-1.22.4.ebuild +++ b/dev-python/numpy/numpy-1.22.4.ebuild @@ -24,7 +24,7 @@ SRC_URI=" )" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc lapack" RDEPEND=" diff --git a/dev-python/numpy/numpy-1.23.1.ebuild b/dev-python/numpy/numpy-1.23.1.ebuild deleted file mode 100644 index b63a338da7c0..000000000000 --- a/dev-python/numpy/numpy-1.23.1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="threads(+)" - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs - -DOC_PV=${PV} -# For when docs aren't ready yet, set to last version -#DOC_PV=1.23.0 -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE=" - https://numpy.org/ - https://github.com/numpy/numpy/ - https://pypi.org/project/numpy/ -" -SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip - https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf - https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf - ) -" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack" - -RDEPEND=" - lapack? ( - >=virtual/cblas-3.8 - >=virtual/lapack-3.8 - ) -" -BDEPEND=" - ${RDEPEND} - >=dev-python/cython-0.29.30[${PYTHON_USEDEP}] - lapack? ( - virtual/pkgconfig - ) - doc? ( - app-arch/unzip - ) - test? ( - >=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - >=dev-python/cffi-1.14.0[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch -) - -distutils_enable_tests pytest - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die - fi -} - -python_prepare_all() { - # Allow use with setuptools 60.x - # See numpy-1.22.1-revert-setuptools-upper-bound.patch for details - export SETUPTOOLS_USE_DISTUTILS=stdlib - - if use lapack; then - local incdir="${EPREFIX}"/usr/include - local libdir="${EPREFIX}"/usr/$(get_libdir) - cat >> site.cfg <<-EOF || die - [blas] - include_dirs = ${incdir} - library_dirs = ${libdir} - blas_libs = cblas,blas - [lapack] - library_dirs = ${libdir} - lapack_libs = lapack - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - export MAKEOPTS=-j1 #660754 - - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - local EPYTEST_DESELECT=( - # very disk- and memory-hungry - numpy/lib/tests/test_io.py::test_large_zip - - # precision problems - numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals - - # runs the whole test suite recursively, that's just crazy - numpy/core/tests/test_mem_policy.py::test_new_policy - - # very slow, unlikely to be practically useful - numpy/typing/tests/test_typing.py - ) - - if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then - # Degenerate case. arm32 chroot on arm64. - # bug #774108 - EPYTEST_DESELECT+=( - numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features - ) - fi - - if use x86 ; then - EPYTEST_DESELECT+=( - # https://github.com/numpy/numpy/issues/18388 - numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow - # https://github.com/numpy/numpy/issues/18387 - numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto - # more precision problems - numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16 - ) - fi - if use arm || use x86 ; then - EPYTEST_DESELECT+=( - # too large for 32-bit platforms - numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array - ) - fi - - [[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=( - # known problem - 'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-]' - ) - - distutils_install_for_testing --single-version-externally-managed \ - --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} - - cd "${TEST_DIR}/lib" || die - epytest -k "not _fuzz" -} - -python_install() { - # https://github.com/numpy/numpy/issues/16005 - local mydistutilsargs=( build_src ) - distutils-r1_python_install ${NUMPY_FCONFIG} - python_optimize -} - -python_install_all() { - local DOCS=( LICENSE.txt README.md THANKS.txt ) - - if use doc; then - local HTML_DOCS=( "${WORKDIR}"/html/. ) - DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) - fi - - distutils-r1_python_install_all -} diff --git a/dev-python/numpy/numpy-1.23.3.ebuild b/dev-python/numpy/numpy-1.23.3.ebuild index 2f892da39bb0..d519478c9437 100644 --- a/dev-python/numpy/numpy-1.23.3.ebuild +++ b/dev-python/numpy/numpy-1.23.3.ebuild @@ -29,7 +29,7 @@ SRC_URI=" " LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc lapack" RDEPEND=" diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest index 4a39f815dd01..e48fb491fe6a 100644 --- a/dev-python/pandas/Manifest +++ b/dev-python/pandas/Manifest @@ -1,3 +1,2 @@ -DIST pandas-1.4.4.tar.gz 4949620 BLAKE2B 7ce236ae28ed6c6857a3acf6936aad2b1dc53a048986809d8dedbb9595dd2234bacbe114b74d8a171a6b31254372ea262566b134e7b5b24d5d4666938c7e6154 SHA512 a12e92dd751ed2342d9291724833732cdadbc9791e59533b9efded570b9893bacbe2f10e6bc70d673adb9356dcb0ae3d64d8a1dfe6ae8a3c70e474556ded4d91 DIST pandas-1.5.0.tar.gz 5191537 BLAKE2B c7dec1d0197e6ac860667177f0f255bb327dbd48fe4501280d578b93f4496e61c0847dc478effeb8c5729d7a9d3e8a643c01db095a9843d6d211a9420f94d42c SHA512 8d340da1e0dff9b64c8993359b35ddcfc796fa15fee1bf1a27ea5a12e33f8b20d45bfac0ff9275b16ff0d4f7855a73962629e06c62bc08ca5e21b4ef1ea29ec2 DIST pandas-1.5.1.tar.gz 5199286 BLAKE2B 17d98870f3397d7a9289a18708021a614b1d456e2ea99dae8927727aabb8aab73bd31f25c3035947f8f4c38404e7d971bf999500b300307b19a2cf6029763d0e SHA512 e5f25f21f17f36c6488f14fbfa391beb9f1989652de01cb8346d2826dead9331fea27295ee1e6f42d0875f2f1a91fcd23d606edd339432589bca5ba8d89e5ecd diff --git a/dev-python/pandas/pandas-1.4.4.ebuild b/dev-python/pandas/pandas-1.4.4.ebuild deleted file mode 100644 index 18b2d5fee82c..000000000000 --- a/dev-python/pandas/pandas-1.4.4.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2022 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} ) -PYTHON_REQ_USE="threads(+)" - -VIRTUALX_REQUIRED="manual" - -inherit distutils-r1 multiprocessing optfeature virtualx - -DESCRIPTION="Powerful data structures for data analysis and statistics" -HOMEPAGE="https://pandas.pydata.org/ - https://github.com/pandas-dev/pandas/" -SRC_URI=" - https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz -" -S="${WORKDIR}/${P/_/}" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="doc full-support minimal test X" -RESTRICT="!test? ( test )" - -RECOMMENDED_DEPEND=" - >=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}] - >=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}] -" - -# TODO: add pandas-gbq to the tree -OPTIONAL_DEPEND=" - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/blosc[${PYTHON_USEDEP}] - || ( - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - ) - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - || ( - dev-python/openpyxl[${PYTHON_USEDEP}] - dev-python/xlsxwriter[${PYTHON_USEDEP}] - ) - >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}] - >=dev-python/xarray-0.12.3[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] - >=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}] - >=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}] - !hppa? ( - dev-python/statsmodels[${PYTHON_USEDEP}] - >=dev-python/scipy-1.1[${PYTHON_USEDEP}] - ) - X? ( - || ( - dev-python/PyQt5[${PYTHON_USEDEP}] - x11-misc/xclip - x11-misc/xsel - ) - ) -" -COMMON_DEPEND=" - >=dev-python/numpy-1.21.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}] - >=dev-python/pytz-2020.1[${PYTHON_USEDEP}] -" -DEPEND=" - ${COMMON_DEPEND} - >=dev-python/cython-0.29.32[${PYTHON_USEDEP}] - doc? ( - ${VIRTUALX_DEPEND} - app-text/pandoc - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/nbsphinx[${PYTHON_USEDEP}] - >=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}] - >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] - >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/xlrd[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - x11-misc/xclip - ) - test? ( - ${VIRTUALX_DEPEND} - ${RECOMMENDED_DEPEND} - ${OPTIONAL_DEPEND} - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - >=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}] - dev-python/openpyxl[${PYTHON_USEDEP}] - dev-python/pymysql[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}] - dev-python/psycopg:2[${PYTHON_USEDEP}] - dev-python/xlsxwriter[${PYTHON_USEDEP}] - x11-misc/xclip - x11-misc/xsel - ) -" -# dev-python/statsmodels invokes a circular dep -# hence rm from doc? ( ), again -RDEPEND=" - ${COMMON_DEPEND} - !minimal? ( ${RECOMMENDED_DEPEND} ) - full-support? ( ${OPTIONAL_DEPEND} ) -" - -python_prepare_all() { - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" \ - -i doc/source/conf.py || die - - # requires package installed - sed -e '/extra_compile_args =/s:"-Werror"::' \ - -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile -j1 -} - -python_compile_all() { - # To build docs the need be located in $BUILD_DIR, - # else PYTHONPATH points to unusable modules. - if use doc; then - cd "${BUILD_DIR}"/lib || die - cp -ar "${S}"/doc . && cd doc || die - LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html - fi -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # test for rounding errors, fails if we have better precision - # e.g. on amd64 with FMA or on arm64 - # https://github.com/pandas-dev/pandas/issues/38921 - pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues - - # TODO - pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated - pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct - pandas/tests/io/test_clipboard.py::TestClipboard::test_raw_roundtrip - - # TODO: these require a running db server - pandas/tests/io/test_sql.py::TestMySQLAlchemy - pandas/tests/io/test_sql.py::TestMySQLAlchemyConn - pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy - pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn - ) - - local -x LC_ALL=C.UTF-8 - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die - epytest pandas --skip-slow --skip-network -m "not single" \ - -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" || - die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - if use doc; then - dodoc -r "${BUILD_DIR}"/lib/doc/build/html - einfo "An initial build of docs is absent of references to statsmodels" - einfo "due to circular dependency. To have them included, emerge" - einfo "statsmodels next and re-emerge pandas with USE doc" - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck - optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1" - optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml - optfeature "for msgpack compression using blosc" dev-python/blosc - optfeature "Template engine for conditional HTML formatting" dev-python/jinja - optfeature "Plotting support" dev-python/matplotlib - optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt - optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1" - optfeature "R I/O support" dev-python/rpy - optfeature "Needed for parts of pandas.stats" dev-python/statsmodels - optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0" - optfeature "miscellaneous statistical functions" dev-python/scipy - optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel -} diff --git a/dev-python/pandas/pandas-1.5.0-r1.ebuild b/dev-python/pandas/pandas-1.5.0-r1.ebuild index fd2fdb4eb220..55fc7c8d2594 100644 --- a/dev-python/pandas/pandas-1.5.0-r1.ebuild +++ b/dev-python/pandas/pandas-1.5.0-r1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_/}" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~x86" IUSE="doc full-support minimal test X" RESTRICT="!test? ( test )" diff --git a/dev-python/pandas/pandas-1.5.0.ebuild b/dev-python/pandas/pandas-1.5.0.ebuild index c1d10a25e0aa..e98015d0d9a0 100644 --- a/dev-python/pandas/pandas-1.5.0.ebuild +++ b/dev-python/pandas/pandas-1.5.0.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_/}" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="doc full-support minimal test X" RESTRICT="!test? ( test )" diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest index f9d877ecbdf5..07b426bc716f 100644 --- a/dev-python/peewee/Manifest +++ b/dev-python/peewee/Manifest @@ -1,2 +1 @@ -DIST peewee-3.15.2.gh.tar.gz 905707 BLAKE2B 7441586c8da5080a50964a4d8e5c73f28b8e1adeb45b4ced675c70f55cb3264460014dbab36f097fbacfc2fce8cf3f42ef36a6c1737a671ecd8bfede6af82c8e SHA512 6fa574161cdd224104bb428b9935574d3dc69ec574e5887ab68c7686d63af856787e3411e27703773c0e2f75f51915da569538662a908c225ace3c14c78892b9 DIST peewee-3.15.3.gh.tar.gz 906883 BLAKE2B 4cc76b4288e8b8e36b4df2f42e31c8eeec314b2af28612d272699e6cc79d836fdc8800f18883e721fd98ca04bf58b0ed26ba61ab36280d28a32d1ca18ab6577c SHA512 bf297423178fca432add6e1ef2aba41ebd87d2bdc34e47872b5c35573dd9eedd42a290cad53dfce68e0bc0e07bb537064c25bf6b43b43d678302d6345eaa35a4 diff --git a/dev-python/peewee/peewee-3.15.2.ebuild b/dev-python/peewee/peewee-3.15.2.ebuild deleted file mode 100644 index acc9186eb336..000000000000 --- a/dev-python/peewee/peewee-3.15.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 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} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -DESCRIPTION="Small Python ORM" -HOMEPAGE=" - https://github.com/coleifer/peewee/ - https://pypi.org/project/peewee/ -" -SRC_URI=" - https://github.com/coleifer/${PN}/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs - -python_test() { - "${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use examples && DOCS=( examples/ ) - distutils-r1_python_install_all -} diff --git a/dev-python/peewee/peewee-3.15.3.ebuild b/dev-python/peewee/peewee-3.15.3.ebuild index 5d5c1d5e81f6..acc9186eb336 100644 --- a/dev-python/peewee/peewee-3.15.3.ebuild +++ b/dev-python/peewee/peewee-3.15.3.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="examples test" RESTRICT="!test? ( test )" diff --git a/dev-python/priority/metadata.xml b/dev-python/priority/metadata.xml index be5f334e546b..8b1452587a52 100644 --- a/dev-python/priority/metadata.xml +++ b/dev-python/priority/metadata.xml @@ -18,4 +18,5 @@ gentoo-staging + \ No newline at end of file diff --git a/dev-python/priority/priority-1.3.0-r1.ebuild b/dev-python/priority/priority-1.3.0-r1.ebuild index c736823fc140..56e640b3850b 100644 --- a/dev-python/priority/priority-1.3.0-r1.ebuild +++ b/dev-python/priority/priority-1.3.0-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" BDEPEND=" test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] ) diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild deleted file mode 100644 index 0e2192664ff6..000000000000 --- a/dev-python/priority/priority-1.3.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree" -HOMEPAGE="https://python-hyper.org/projects/priority/en/stable/ - https://github.com/python-hyper/priority - https://pypi.org/project/priority/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -BDEPEND=" - test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}"/priority-1.3.0-test-timeout.patch -) - -distutils_enable_tests pytest diff --git a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild index af2a3ec5e25b..fd5f63c77cc4 100644 --- a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild +++ b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/python LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" RDEPEND=" dev-python/six[${PYTHON_USEDEP}] diff --git a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild index 8abd7d03dc15..3a0807733ced 100644 --- a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild +++ b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild @@ -18,7 +18,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86" # test environment is non-trivial to set up, so just use docker # (see python_test below) # also for alpha/beta Python releases support: diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild index 687bb9cdbb6f..ab0ae6e30fc8 100644 --- a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild +++ b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild @@ -21,7 +21,7 @@ S=${WORKDIR}/python-${P} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86" RDEPEND=" dev-python/packaging[${PYTHON_USEDEP}] diff --git a/dev-python/pytest-env/pytest-env-0.8.1.ebuild b/dev-python/pytest-env/pytest-env-0.8.1.ebuild index e7f0a955ae1c..8edc7bebd913 100644 --- a/dev-python/pytest-env/pytest-env-0.8.1.ebuild +++ b/dev-python/pytest-env/pytest-env-0.8.1.ebuild @@ -3,16 +3,20 @@ EAPI=8 -DISTUTILS_USE_PEP517=setuptools +DISTUTILS_USE_PEP517=hatchling PYTHON_COMPAT=( python3_{7,8,9,10} ) inherit distutils-r1 DESCRIPTION="py.test plugin that allows you to add environment variables" -HOMEPAGE="https://github.com/MobileDynasty/pytest-env" +HOMEPAGE="https://github.com/pytest-dev/pytest-env" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz" +S="${WORKDIR}/${P/-/_}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]" +BDEPEND="dev-python/hatch-vcs[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest index abf39ebef705..21a5b68886ac 100644 --- a/dev-python/pytest-httpserver/Manifest +++ b/dev-python/pytest-httpserver/Manifest @@ -1,2 +1 @@ -DIST pytest-httpserver-1.0.5.gh.tar.gz 80395 BLAKE2B 68c075032c57f25854d390f73bf61b7efbe18f78d7f0b2a2a3be10d586ca9cc3ce4a1b390a2ba0da1e88558513782388069c419dae4908a0581e8d583f452bee SHA512 8275475bb044d54769e906571520fafbb9f6fa32fc003f4a00f72b9ff9930e4b80ee84564df1521569cc2a15f5d371c6315129263bc167d0621141004d509a25 DIST pytest-httpserver-1.0.6.gh.tar.gz 83737 BLAKE2B d0db97227bcb3336a4bd944cf26e2d3e96132baee5991cdff901a1f546174e977b6472458911fc6b92bb13b6d3dae499e0bf3507be265385601e838c4781f0a3 SHA512 5eacfbf159f3a09d73f54da8f3ff885b8d2138e430af27df6039a30e63d7ebcbcf088efe8e7fa56ed50b66ea5b7e3ad7a61c0e8a57d5cb100c2a063df7b6f5c4 diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild deleted file mode 100644 index 01720d13e435..000000000000 --- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="HTTP server for pytest to test HTTP clients" -HOMEPAGE="https://github.com/csernazs/pytest-httpserver" -SRC_URI=" - https://github.com/csernazs/pytest-httpserver/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/requests[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - sed -i -e '/^include = \[/,/\]/d' pyproject.toml || die - - distutils-r1_python_prepare_all -} - -python_test() { - epytest -p no:localserver -} diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild index e39b771a36ab..9a640cea1be1 100644 --- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild +++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" RDEPEND=" dev-python/werkzeug[${PYTHON_USEDEP}] diff --git a/dev-python/python-ldap/python-ldap-3.4.3.ebuild b/dev-python/python-ldap/python-ldap-3.4.3.ebuild index 165ac96b98a0..0d65a9a80d81 100644 --- a/dev-python/python-ldap/python-ldap-3.4.3.ebuild +++ b/dev-python/python-ldap/python-ldap-3.4.3.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}-${P} LICENSE="MIT PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris" IUSE="examples sasl ssl" RDEPEND=" diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild index b38c02ceed64..9e5f2e08610d 100644 --- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild +++ b/dev-python/python-nbxmpp/python-nbxmpp-3.2.4.ebuild @@ -19,7 +19,7 @@ SRC_URI=" SLOT="0" LICENSE="GPL-3" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" RDEPEND=" dev-libs/gobject-introspection diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild index 70e1b4bae7b5..8cc5cd177ecf 100644 --- a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild +++ b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86" IUSE="doc" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" diff --git a/dev-python/python-xlib/python-xlib-0.31.ebuild b/dev-python/python-xlib/python-xlib-0.31.ebuild deleted file mode 100644 index f04f13878934..000000000000 --- a/dev-python/python-xlib/python-xlib-0.31.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit distutils-r1 virtualx - -DESCRIPTION="A fully functional X client library for Python, written in Python" -HOMEPAGE="https://github.com/python-xlib/python-xlib" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86" -IUSE="doc" - -RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND} - dev-python/setuptools_scm[${PYTHON_USEDEP}] - doc? ( sys-apps/texinfo ) - test? ( dev-python/mock[${PYTHON_USEDEP}] ) -" - -distutils_enable_tests unittest - -python_compile_all() { - use doc && emake -C doc/info -} - -src_test() { - virtx distutils-r1_src_test -} - -python_install_all() { - use doc && doinfo doc/info/*.info - distutils-r1_python_install_all -} diff --git a/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch b/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch new file mode 100644 index 000000000000..47c222fba143 --- /dev/null +++ b/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch @@ -0,0 +1,21 @@ +https://github.com/bagel897/pytoolconfig/commit/7fbd830f1c302ed8151ecc2bd52c40cf70b1a580 +https://bugs.gentoo.org/878189 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -2,7 +2,7 @@ + name = "pytoolconfig" + version = "1.2.2" + description = "Python tool configuration" +-license-expression = "LGPL-3.0-or-later" ++license = "LGPL-3.0-or-later" + dependencies = [ + "tomli>=2.0; python_version < \"3.11\"", + "packaging>=21.3", +@@ -70,6 +70,6 @@ strict = true + + [build-system] + requires = [ +- "pdm-pep517>=1.0.0", ++ "pdm-pep517>=1.0.5", + ] + build-backend = "pdm.pep517.api" diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild new file mode 100644 index 000000000000..2630357359dd --- /dev/null +++ b/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=pdm +PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Python tool configuration" +HOMEPAGE=" + https://pypi.org/project/pytoolconfig/ + https://github.com/bageljrkhanofemus/pytoolconfig/ +" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + dev-python/packaging[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/tomli[${PYTHON_USEDEP}] + ' 3.{8..10} ) +" +BDEPEND=" + >=dev-python/pdm-pep517-1.0.5[${PYTHON_USEDEP}] + test? ( + >=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}] + >=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-fix-licence.patch +) + +distutils_enable_tests pytest diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest index 41674dc4ffda..2cc91439734e 100644 --- a/dev-python/qtawesome/Manifest +++ b/dev-python/qtawesome/Manifest @@ -1,2 +1,3 @@ DIST QtAwesome-1.1.1.tar.gz 2277767 BLAKE2B ca8668e0b6633087b7e09ffcec19809c8b7e12af2caa0beac896940cdbf3a113206f6952916fbe81c53899a56f8222e613df9c028f59907a2553174551ef9fcf SHA512 3cf04b822464c14f52f23499e64515f50f743aba40a8d22224d22315342cef760da476dc9b2ae42e901ac8ef8440e105a6bf6175efc6749250e0fbbbc255e08f DIST QtAwesome-1.2.0.tar.gz 2280428 BLAKE2B 15053a87ca4cf2c25b1633de67f54838b144db05f5165023c121fc84017cc4db6e24238d8518ee2494c0b21752b9b82007ef96f04e6d072b1f51ed84c12bcada SHA512 11307af5592da83fd357e33e5f679821cd16d070f0e751619c28ea29a5511dec7a1d62e81713c91660125899624d5700097d597c85e718f3738b4d47b6477b32 +DIST QtAwesome-1.2.1.tar.gz 2280937 BLAKE2B 4d54e8d9fabd833ca4a430ed9573da4feb6aeaae9090fbdf7874d68214de0c0548be18b2f5d2c643add754c748f6af97eaa821aa3d341ed6dd563b8769c1a5c7 SHA512 dd4ef533c5a7bc5fc7eba549c166653efb2352e12412d5678e30cc8865fe44684ca6e070ca61801910c3eefd5673325cb87555e0fb30007b5fd0b53d04dc1c44 diff --git a/dev-python/qtawesome/qtawesome-1.2.1.ebuild b/dev-python/qtawesome/qtawesome-1.2.1.ebuild new file mode 100644 index 000000000000..ccadb13471ba --- /dev/null +++ b/dev-python/qtawesome/qtawesome-1.2.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 virtualx + +MY_PN="QtAwesome" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt" +HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-fonts/fontawesome + dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}] +" +BDEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )" + +distutils_enable_tests pytest +distutils_enable_sphinx docs/source + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + # Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run + # the tests with pyqt5 + PYTEST_QT_API="pyqt5" epytest || die "Tests failed with ${EPYTHON}" +} diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest index f551a4487671..e106894fd6a2 100644 --- a/dev-python/rapidfuzz/Manifest +++ b/dev-python/rapidfuzz/Manifest @@ -1,2 +1,3 @@ DIST rapidfuzz-2.11.0.tar.gz 812669 BLAKE2B e7897b2770202d46cb70323d19a79c6f34c379cf43ab211e2ba4d05ef6f1630d49b3cef70ab52bba1ac0a9cc15cd934e86aab829ec84195a6b583a561efc8cb2 SHA512 df5e77248c2a005ff1e0fbd4b4ef15fbdb88a6738d66823ba9bf8c380943c59fe82ac317dab1e6279b33112d2484563d65c33e972d52ab82b083cd8a8aae7ce0 DIST rapidfuzz-2.11.1.tar.gz 813221 BLAKE2B 1fab9b564396f820c9bd5c240df95a2e864b0e3efffb4239fa2ad719b92d2997d9519ccf906fe04c61a0fc1daf9ed0df734f95d4cdd19529e46716935182030b SHA512 19f6dbff31f11cc16f031f9bf53f7c60051a84f2f81dfc1c17fc83827a7d8551d708420b4116ab91e56b5d6de652b4d571f4055ebcb208e5dd57e8778050ca29 +DIST rapidfuzz-2.12.0.tar.gz 836008 BLAKE2B 7d8cb6637247711f2f6fed63c9f26e2d3b8871b9a4926b86e37f6d42fed0f5ac2af727a1b350f4b55787b6fd5a393c3b90ee91d122731bb3f64acb4edb5126f0 SHA512 06c5e46332c98ea8feb83a89b879efc12a737f58312a862ab426e899bdfd3661601d4a417f7bc518e1006a2f05fa31ce1003ae9dd67c1e7d58f903e65f9eb6e7 diff --git a/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild new file mode 100644 index 000000000000..fb272c5b3bfb --- /dev/null +++ b/dev-python/rapidfuzz/rapidfuzz-2.12.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# custom wrapper over setuptools +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics" +HOMEPAGE=" + https://github.com/maxbachmann/RapidFuzz/ + https://pypi.org/project/rapidfuzz/ +" +SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +# all these are header-only libraries +DEPEND=" + >=dev-cpp/taskflow-3.0.0 + >=dev-cpp/rapidfuzz-cpp-1.9.0 + dev-python/numpy[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/rapidfuzz_capi[${PYTHON_USEDEP}] + >=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/hypothesis[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + # sterilize build flags + sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die + + distutils-r1_src_prepare + + export RAPIDFUZZ_BUILD_EXTENSION=1 +} diff --git a/dev-python/regex/regex-2022.9.13.ebuild b/dev-python/regex/regex-2022.9.13.ebuild index e81cc8759631..c7b7e9c72487 100644 --- a/dev-python/regex/regex-2022.9.13.ebuild +++ b/dev-python/regex/regex-2022.9.13.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" IUSE="doc" PATCHES=( diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest index e3ed802a1046..6933d1ead77d 100644 --- a/dev-python/requests-toolbelt/Manifest +++ b/dev-python/requests-toolbelt/Manifest @@ -1,2 +1,3 @@ DIST requests-toolbelt-0.10.0.tar.gz 211210 BLAKE2B 73196e33d42ff6f4532cd2904537451cc237627a149fa759fca7a66e360c0ddb8baf8c4537c880baf03a25065226380788449bae05434aad37962034e1324acb SHA512 75e3a3e609625254e1f078d3c48c664b3118f5a406c84e59c4e9acdeb20a79b5d38ceaaf9578920063f063aa8385139310c06331499aaa92d3c51146f908f1a1 +DIST requests-toolbelt-0.10.1.gh.tar.gz 201504 BLAKE2B 48c5b9f46000d9809e482278626bbce805b93ed2a4a5d074bad4f7fbda75984dd55919eca31909c98c9a74ca7b323e73c90691dced0734964621d4ba5748d464 SHA512 ad6dfe3329c8be5a4521d223d25ec303201e706b34199c084efd0a30b8bc8cfb3382e80a502dc25bd5f7e5b2774a119d2255c49408979aaec45e221f412a7b52 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93 diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild new file mode 100644 index 000000000000..93ee67673db0 --- /dev/null +++ b/dev-python/requests-toolbelt/requests-toolbelt-0.10.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 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} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="A utility belt for advanced users of python-requests" +HOMEPAGE=" + https://toolbelt.readthedocs.io/ + https://github.com/requests/toolbelt/ + https://pypi.org/project/requests-toolbelt/ +" +SRC_URI=" + https://github.com/requests/toolbelt/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" +S=${WORKDIR}/${P#requests-} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + +RDEPEND=" +