diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-23 15:47:41 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-23 15:47:41 +0000 |
commit | 0c0e12e958e2e9fea4cd09337b1824dd4e961f36 (patch) | |
tree | 88f3034b5474f788539d78009e3d9fe2008e9938 | |
parent | 2023-05-23 15:34:05 UTC (diff) | |
parent | dev-python/soupsieve: Stabilize 2.4.1 ALLARCHES, #907010 (diff) | |
download | gentoo-0c0e12e958e2e9fea4cd09337b1824dd4e961f36.tar.gz gentoo-0c0e12e958e2e9fea4cd09337b1824dd4e961f36.tar.bz2 gentoo-0c0e12e958e2e9fea4cd09337b1824dd4e961f36.zip |
Merge updates from master
54 files changed, 177 insertions, 74 deletions
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest index 97a4d25f7608..b25cccf5cc50 100644 --- a/dev-python/appdirs/Manifest +++ b/dev-python/appdirs/Manifest @@ -1 +1,2 @@ +DIST appdirs-1.4.4.gh.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656 DIST appdirs-1.4.4.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656 diff --git a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild new file mode 100644 index 000000000000..b7918a897c1a --- /dev/null +++ b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Module for determining appropriate platform-specific dirs" +HOMEPAGE=" + https://github.com/ActiveState/appdirs/ + https://pypi.org/project/appdirs/ +" +SRC_URI=" + https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.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 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +python_test() { + "${EPYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}" +} diff --git a/dev-python/attrs/attrs-23.1.0.ebuild b/dev-python/attrs/attrs-23.1.0.ebuild index 2f5f859f9bd4..b7956a6cffe3 100644 --- a/dev-python/attrs/attrs-23.1.0.ebuild +++ b/dev-python/attrs/attrs-23.1.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris" BDEPEND=" dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}] diff --git a/dev-python/calver/calver-2022.06.26.ebuild b/dev-python/calver/calver-2022.06.26.ebuild index 01799f7c30b4..b7cfb2f6e6df 100644 --- a/dev-python/calver/calver-2022.06.26.ebuild +++ b/dev-python/calver/calver-2022.06.26.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 diff --git a/dev-python/certifi/certifi-3021.3.16-r3.ebuild b/dev-python/certifi/certifi-3021.3.16-r3.ebuild index 25806e4a6e97..3757907c426e 100644 --- a/dev-python/certifi/certifi-3021.3.16-r3.ebuild +++ b/dev-python/certifi/certifi-3021.3.16-r3.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 diff --git a/dev-python/editables/editables-0.3.ebuild b/dev-python/editables/editables-0.3.ebuild index 07fa8a8ddcdf..1ae193d9b14e 100644 --- a/dev-python/editables/editables-0.3.ebuild +++ b/dev-python/editables/editables-0.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 diff --git a/dev-python/flaky/flaky-3.7.0-r4.ebuild b/dev-python/flaky/flaky-3.7.0-r4.ebuild index 9f1df64da087..545f2f8bb1be 100644 --- a/dev-python/flaky/flaky-3.7.0-r4.ebuild +++ b/dev-python/flaky/flaky-3.7.0-r4.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/flit-core/flit-core-3.9.0.ebuild b/dev-python/flit-core/flit-core-3.9.0.ebuild index 020992e541b4..5c4b009593d6 100644 --- a/dev-python/flit-core/flit-core-3.9.0.ebuild +++ b/dev-python/flit-core/flit-core-3.9.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -20,7 +20,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" - dev-python/tomli[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/tomli[${PYTHON_USEDEP}] + ' 3.{9..10}) " BDEPEND=" test? ( dev-python/testpath[${PYTHON_USEDEP}] ) diff --git a/dev-python/genty/genty-1.3.2-r2.ebuild b/dev-python/genty/genty-1.3.2-r2.ebuild index 78157bd5abff..7d26078310b9 100644 --- a/dev-python/genty/genty-1.3.2-r2.ebuild +++ b/dev-python/genty/genty-1.3.2-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/gpep517/gpep517-13.ebuild b/dev-python/gpep517/gpep517-13.ebuild index d1252f57dcab..f8443cf1d81e 100644 --- a/dev-python/gpep517/gpep517-13.ebuild +++ b/dev-python/gpep517/gpep517-13.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 @@ -25,7 +25,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv RDEPEND=" >=dev-python/installer-0.5.0[${PYTHON_USEDEP}] - >=dev-python/tomli-1.2.3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/tomli-1.2.3[${PYTHON_USEDEP}] + ' 3.{9..10}) " distutils_enable_tests pytest diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild index 2a2889a3a286..9afaa5ac1c72 100644 --- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild +++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3 python3_{10..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 @@ -26,7 +26,7 @@ RDEPEND=" dev-python/hatchling[${PYTHON_USEDEP}] $(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] - ' 3.8 3.9 3.10) + ' 3.{9..10}) " distutils_enable_tests pytest diff --git a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild index 543354470f9c..529100a26457 100644 --- a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild +++ b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 diff --git a/dev-python/hatchling/hatchling-1.17.0.ebuild b/dev-python/hatchling/hatchling-1.17.0.ebuild index a71cd5b7faf4..686e2e8abd42 100644 --- a/dev-python/hatchling/hatchling-1.17.0.ebuild +++ b/dev-python/hatchling/hatchling-1.17.0.ebuild @@ -4,8 +4,8 @@ EAPI=8 DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( pypy3 python3_{9..11} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) +PYTHON_TESTED=( pypy3 python3_{10..11} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 ) inherit distutils-r1 diff --git a/dev-python/importlib-metadata/importlib-metadata-6.6.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.6.0.ebuild index 9c9a3496dc21..bbca64472891 100644 --- a/dev-python/importlib-metadata/importlib-metadata-6.6.0.ebuild +++ b/dev-python/importlib-metadata/importlib-metadata-6.6.0.ebuild @@ -19,7 +19,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" dev-python/zipp[${PYTHON_USEDEP}] diff --git a/dev-python/iniconfig/iniconfig-2.0.0.ebuild b/dev-python/iniconfig/iniconfig-2.0.0.ebuild index 1e412b78c879..8bac280e3cac 100644 --- a/dev-python/iniconfig/iniconfig-2.0.0.ebuild +++ b/dev-python/iniconfig/iniconfig-2.0.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 diff --git a/dev-python/installer/installer-0.7.0.ebuild b/dev-python/installer/installer-0.7.0.ebuild index c88d3eef3c8d..647694668b44 100644 --- a/dev-python/installer/installer-0.7.0.ebuild +++ b/dev-python/installer/installer-0.7.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild index 186e3ed1f91a..93248d49e97c 100644 --- a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild +++ b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 pypi diff --git a/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild b/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild index c4cfb54397ca..0d654189f38f 100644 --- a/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild +++ b/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild @@ -7,7 +7,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild index e2dac0c25fb0..6e2b1cd548a7 100644 --- a/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild +++ b/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild @@ -7,7 +7,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 pypi diff --git a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild index bf60d9f2be40..0c97430b866e 100644 --- a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild +++ b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild @@ -7,7 +7,8 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +CLI_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 ) inherit distutils-r1 pypi @@ -28,9 +29,11 @@ RDEPEND=" # needed only for CLI tool, make it PDEPEND to reduce pain in setuptools # bootstrap PDEPEND=" - dev-python/autocommand[${PYTHON_USEDEP}] - dev-python/inflect[${PYTHON_USEDEP}] - dev-python/more-itertools[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/autocommand[${PYTHON_USEDEP}] + dev-python/inflect[${PYTHON_USEDEP}] + dev-python/more-itertools[${PYTHON_USEDEP}] + ' "${CLI_COMPAT[@]}") " BDEPEND=" test? ( @@ -59,6 +62,19 @@ src_configure() { EOF } +python_test() { + local EPYTEST_IGNORE=() + + if ! has "${EPYTHON/./_}" "${CLI_COMPAT[@]}"; then + EPYTEST_IGNORE+=( + jaraco/text/show-newlines.py + jaraco/text/strip-prefix.py + ) + fi + + epytest +} + python_install() { distutils-r1_python_install # rename to workaround a bug in pkg_resources diff --git a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild index 10a33a9f9e25..8caf4f3e6208 100644 --- a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild +++ b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" >=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}] diff --git a/dev-python/markdown/markdown-3.4.3.ebuild b/dev-python/markdown/markdown-3.4.3.ebuild index 9cdc1fa349e2..6ffc28a59b26 100644 --- a/dev-python/markdown/markdown-3.4.3.ebuild +++ b/dev-python/markdown/markdown-3.4.3.ebuild @@ -19,7 +19,7 @@ HOMEPAGE=" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="doc" RDEPEND=" diff --git a/dev-python/mock/mock-5.0.2.ebuild b/dev-python/mock/mock-5.0.2.ebuild index d817a85380c0..6beaa22c87fe 100644 --- a/dev-python/mock/mock-5.0.2.ebuild +++ b/dev-python/mock/mock-5.0.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/more-itertools/more-itertools-9.1.0.ebuild b/dev-python/more-itertools/more-itertools-9.1.0.ebuild index eb192c8d062d..611142f06504 100644 --- a/dev-python/more-itertools/more-itertools-9.1.0.ebuild +++ b/dev-python/more-itertools/more-itertools-9.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/nspektr/nspektr-0.4.0.ebuild b/dev-python/nspektr/nspektr-0.4.0.ebuild index eefcc665b8a5..a2b12360735d 100644 --- a/dev-python/nspektr/nspektr-0.4.0.ebuild +++ b/dev-python/nspektr/nspektr-0.4.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 pypi diff --git a/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/dev-python/ordered-set/ordered-set-4.1.0.ebuild index e8fc5259ccf2..0ed1190b0953 100644 --- a/dev-python/ordered-set/ordered-set-4.1.0.ebuild +++ b/dev-python/ordered-set/ordered-set-4.1.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/packaging/packaging-23.1.ebuild b/dev-python/packaging/packaging-23.1.ebuild index a81cc4543c96..c5a7d0eb0a02 100644 --- a/dev-python/packaging/packaging-23.1.ebuild +++ b/dev-python/packaging/packaging-23.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/pathspec/pathspec-0.11.1.ebuild b/dev-python/pathspec/pathspec-0.11.1.ebuild index faf29d41ec6b..a0dab482bf5f 100644 --- a/dev-python/pathspec/pathspec-0.11.1.ebuild +++ b/dev-python/pathspec/pathspec-0.11.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/platformdirs/platformdirs-3.5.1.ebuild b/dev-python/platformdirs/platformdirs-3.5.1.ebuild index 58e26b5de925..70e821d796fb 100644 --- a/dev-python/platformdirs/platformdirs-3.5.1.ebuild +++ b/dev-python/platformdirs/platformdirs-3.5.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild index c42bfaf18ddb..46ad5b885733 100644 --- a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild +++ b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest index 08e5f598ee9f..11d840f13f4a 100644 --- a/dev-python/pretend/Manifest +++ b/dev-python/pretend/Manifest @@ -1 +1 @@ -DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0 +DIST pretend-1.0.9.gh.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0 diff --git a/dev-python/pretend/pretend-1.0.9-r2.ebuild b/dev-python/pretend/pretend-1.0.9-r2.ebuild index e6663861036f..7feaf21db077 100644 --- a/dev-python/pretend/pretend-1.0.9-r2.ebuild +++ b/dev-python/pretend/pretend-1.0.9-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 @@ -15,7 +15,7 @@ HOMEPAGE=" " SRC_URI=" https://github.com/alex/pretend/archive/v${PV}.tar.gz - -> ${P}.tar.gz + -> ${P}.gh.tar.gz " LICENSE="BSD" diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild index cdca036e890e..400760729751 100644 --- a/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild +++ b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND=" <dev-python/pyasn1-0.6.0[${PYTHON_USEDEP}] diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest index fef86e5a9f4d..27ccb2046679 100644 --- a/dev-python/pyparsing/Manifest +++ b/dev-python/pyparsing/Manifest @@ -1 +1 @@ -DIST pyparsing_3.0.9.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d +DIST pyparsing_3.0.9.gh.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d diff --git a/dev-python/pyparsing/pyparsing-3.0.9.ebuild b/dev-python/pyparsing/pyparsing-3.0.9.ebuild index 3958b5836924..d45b3f88effb 100644 --- a/dev-python/pyparsing/pyparsing-3.0.9.ebuild +++ b/dev-python/pyparsing/pyparsing-3.0.9.ebuild @@ -5,14 +5,20 @@ EAPI=7 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 MY_P=${P/-/_} DESCRIPTION="Easy-to-use Python module for text parsing" -HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +HOMEPAGE=" + https://github.com/pyparsing/pyparsing/ + https://pypi.org/project/pyparsing/ +" +SRC_URI=" + https://github.com/pyparsing/pyparsing/archive/${MY_P}.tar.gz + -> ${MY_P}.gh.tar.gz +" S="${WORKDIR}/${PN}-${MY_P}" LICENSE="MIT" diff --git a/dev-python/pypdf/pypdf-3.8.1.ebuild b/dev-python/pypdf/pypdf-3.8.1.ebuild index ffc9d52b91da..f378e2e758c5 100644 --- a/dev-python/pypdf/pypdf-3.8.1.ebuild +++ b/dev-python/pypdf/pypdf-3.8.1.ebuild @@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV} LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" RDEPEND=" $(python_gen_cond_dep ' diff --git a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild index 3d5766a44bf3..fafb81a44a96 100644 --- a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild +++ b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild @@ -5,7 +5,8 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_TESTED=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 ) inherit distutils-r1 pypi @@ -25,7 +26,9 @@ RDEPEND=" BDEPEND=" dev-python/setuptools-scm[${PYTHON_USEDEP}] test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + ' "${PYTHON_TESTED[@]}") ) " @@ -38,6 +41,11 @@ src_prepare() { } python_test() { + if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then + einfo "Skipping tests on ${EPYTHON}" + return + fi + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin local EPYTEST_DESELECT=() diff --git a/dev-python/pytest/pytest-7.3.1.ebuild b/dev-python/pytest/pytest-7.3.1.ebuild index e7a3a8d9dc0d..c7ec76740a28 100644 --- a/dev-python/pytest/pytest-7.3.1.ebuild +++ b/dev-python/pytest/pytest-7.3.1.ebuild @@ -4,8 +4,8 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{9..11} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) +PYTHON_TESTED=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 ) inherit distutils-r1 multiprocessing pypi @@ -30,7 +30,7 @@ RDEPEND=" $(python_gen_cond_dep ' >=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}] >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}] - ' 3.8 3.9 3.10) + ' 3.{9..10}) " BDEPEND=" >=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}] diff --git a/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild index c2e2fe6153af..6cc80301d9c3 100644 --- a/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild +++ b/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" dev-python/dbus-python[${PYTHON_USEDEP}] diff --git a/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild b/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild index 2778e3b55030..e91d099396a3 100644 --- a/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild +++ b/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" " LICENSE="CC0-1.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" SLOT="0" RDEPEND=" diff --git a/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild b/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild index 515bec3c7bf9..299d03307143 100644 --- a/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild +++ b/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/setuptools/setuptools-67.7.2.ebuild b/dev-python/setuptools/setuptools-67.7.2.ebuild index 874467a94fdb..ff59935d835d 100644 --- a/dev-python/setuptools/setuptools-67.7.2.ebuild +++ b/dev-python/setuptools/setuptools-67.7.2.ebuild @@ -21,7 +21,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/setuptools/setuptools-67.8.0.ebuild b/dev-python/setuptools/setuptools-67.8.0.ebuild index d60048548d3a..36af7d456dbf 100644 --- a/dev-python/setuptools/setuptools-67.8.0.ebuild +++ b/dev-python/setuptools/setuptools-67.8.0.ebuild @@ -8,7 +8,7 @@ EAPI=8 DISTUTILS_USE_PEP517=standalone PYTHON_TESTED=( python3_{10..11} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 multiprocessing pypi diff --git a/dev-python/six/six-1.16.0-r1.ebuild b/dev-python/six/six-1.16.0-r1.ebuild index 5803cfb4223a..841baca9c65e 100644 --- a/dev-python/six/six-1.16.0-r1.ebuild +++ b/dev-python/six/six-1.16.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/soupsieve/soupsieve-2.4.1.ebuild b/dev-python/soupsieve/soupsieve-2.4.1.ebuild index 97f0a6c4a683..6df6743818e0 100644 --- a/dev-python/soupsieve/soupsieve-2.4.1.ebuild +++ b/dev-python/soupsieve/soupsieve-2.4.1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" 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? ( diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest index 271f8acba8f6..2c9ab84301aa 100644 --- a/dev-python/testpath/Manifest +++ b/dev-python/testpath/Manifest @@ -1 +1 @@ -DIST testpath-0.6.0.tar.gz 92307 BLAKE2B 320695b4224803214759a74e64e969a244814f4767eb6092b758ba9fcbfadce81afa3fa5eee65b8c8fe9c54e486d9abf75a18b867883740052c58d1eb2671e23 SHA512 fe13523138c1e67f33a3aa707e81b8cc8b5a720ab231ea2c2407da003178d779a649f664213822022e26325fed4ddf468cf727737b94eb2ebf7315aacbce6857 +DIST testpath-0.6.0.gh.tar.gz 92307 BLAKE2B 320695b4224803214759a74e64e969a244814f4767eb6092b758ba9fcbfadce81afa3fa5eee65b8c8fe9c54e486d9abf75a18b867883740052c58d1eb2671e23 SHA512 fe13523138c1e67f33a3aa707e81b8cc8b5a720ab231ea2c2407da003178d779a649f664213822022e26325fed4ddf468cf727737b94eb2ebf7315aacbce6857 diff --git a/dev-python/testpath/testpath-0.6.0.ebuild b/dev-python/testpath/testpath-0.6.0.ebuild index a6df6f859200..cd0fac55c802 100644 --- a/dev-python/testpath/testpath-0.6.0.ebuild +++ b/dev-python/testpath/testpath-0.6.0.ebuild @@ -4,13 +4,20 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Test utilities for code working with files and commands" -HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/" -SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE=" + https://github.com/jupyter/testpath/ + https://testpath.readthedocs.io/en/latest/ + https://pypi.org/project/testpath/ +" +SRC_URI=" + https://github.com/jupyter/testpath/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" LICENSE="MIT" SLOT="0" diff --git a/dev-python/tomli/tomli-2.0.1-r1.ebuild b/dev-python/tomli/tomli-2.0.1-r1.ebuild index c16784aaaec0..4c3f11c00a8f 100644 --- a/dev-python/tomli/tomli-2.0.1-r1.ebuild +++ b/dev-python/tomli/tomli-2.0.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.5.22.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.5.22.ebuild index d98eeff0dee4..46ce5f085592 100644 --- a/dev-python/trove-classifiers/trove-classifiers-2023.5.22.ebuild +++ b/dev-python/trove-classifiers/trove-classifiers-2023.5.22.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( pypy3 python3_{10..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 pypi diff --git a/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild index ab530b037f98..99c693367de7 100644 --- a/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild +++ b/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 diff --git a/dev-python/wheel/wheel-0.40.0.ebuild b/dev-python/wheel/wheel-0.40.0.ebuild index b078248e2296..91ac147ace23 100644 --- a/dev-python/wheel/wheel-0.40.0.ebuild +++ b/dev-python/wheel/wheel-0.40.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi diff --git a/dev-python/yarl/yarl-1.9.2.ebuild b/dev-python/yarl/yarl-1.9.2.ebuild index 8cc9f27c1914..d7632ec38377 100644 --- a/dev-python/yarl/yarl-1.9.2.ebuild +++ b/dev-python/yarl/yarl-1.9.2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos" RDEPEND=" >=dev-python/multidict-4.0[${PYTHON_USEDEP}] diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index f4ef89ee792e..ec1dd08b197c 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -605,7 +605,7 @@ distutils_enable_tests() { setup.py) ;; unittest) - test_pkg="dev-python/unittest-or-fail" + # dep handled below ;; *) die "${FUNCNAME}: unsupported argument: ${1}" @@ -623,6 +623,13 @@ distutils_enable_tests() { ${test_pkg}[\${PYTHON_USEDEP}] ")" fi + elif [[ ${1} == unittest ]]; then + # unittest-or-fail is needed in py<3.12 + test_deps+=" + $(python_gen_cond_dep ' + dev-python/unittest-or-fail[${PYTHON_USEDEP}] + ' 3.{9..11}) + " fi if [[ -n ${test_deps} ]]; then IUSE+=" test" @@ -1318,6 +1325,28 @@ distutils_pep517_install() { local config_settings= case ${DISTUTILS_USE_PEP517} in + maturin) + # ebuild's DISTUTILS_ARGS are currently ignored if <1.0.0, ebuilds + # should set the dependency if used until this can be cleaned up + # (reminder to cleanup the old MATURIN_PEP517_ARGS block too) + if has_version -b '>=dev-util/maturin-1.0.0'; then + # `maturin pep517 build-wheel --help` for options + local maturin_args=( + "${DISTUTILS_ARGS[@]}" + --jobs="$(makeopts_jobs)" + --skip-auditwheel # see bug #831171 + $(in_iuse debug && usex debug '--profile=dev' '') + ) + + config_settings=$( + "${EPYTHON}" - "${maturin_args[@]}" <<-EOF || die + import json + import sys + print(json.dumps({"build-args": sys.argv[1:]})) + EOF + ) + fi + ;; meson-python) local -x NINJAOPTS=$(get_NINJAOPTS) if has_version -b '>=dev-python/meson-python-0.13'; then @@ -1493,13 +1522,13 @@ distutils-r1_python_compile() { fi ;; maturin) - # auditwheel may auto-bundle libraries (bug #831171), - # also support cargo.eclass' IUSE=debug if available - local -x MATURIN_PEP517_ARGS=" - --jobs=$(makeopts_jobs) - --skip-auditwheel - $(in_iuse debug && usex debug --profile=dev '') - " + if has_version -b '<dev-util/maturin-1.0.0'; then + local -x MATURIN_PEP517_ARGS=" + --jobs=$(makeopts_jobs) + --skip-auditwheel + $(in_iuse debug && usex debug --profile=dev '') + " + fi ;; no) return diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index d21e54c6ecc9..40792714cc56 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1344,7 +1344,12 @@ eunittest() { _python_check_EPYTHON - set -- "${EPYTHON}" -m unittest_or_fail discover -v "${@}" + # unittest fails with "no tests" correctly since Python 3.12 + local runner=unittest + if _python_impl_matches "${EPYTHON}" 3.{9..11}; then + runner=unittest_or_fail + fi + set -- "${EPYTHON}" -m "${runner}" discover -v "${@}" echo "${@}" >&2 "${@}" || die -n "Tests failed with ${EPYTHON}" |