From 9081dc7d2c4b86413bd3036b87c3e7fabccc9993 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 14 Dec 2023 05:19:06 +0000 Subject: [PATCH 1/7] dev-python/python-bugzilla: enable py3.12 Signed-off-by: Sam James --- dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild index 3f93f0ced7812..95d75fb273cfe 100644 --- a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild +++ b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi From 34fb30526a251e142eae4aa181538654f0dcff47 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 14 Dec 2023 05:19:21 +0000 Subject: [PATCH 2/7] app-admin/gentoo-retirement-scripts: enable py3.12 Signed-off-by: Sam James --- .../gentoo-retirement-scripts-2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild index 02746bc07a029..425f585ae197d 100644 --- a/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild +++ b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-single-r1 DESCRIPTION="Scripts to help retiring Gentoo developers" From f1e0de88935f7374be100e3d408ed065f4095846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 2 Dec 2023 13:40:25 +0100 Subject: [PATCH 3/7] python-utils-r1.eclass: epytest, use NO_COLOR rather than NOCOLOR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update epytest to respect the modern NO_COLOR variable rather than Portage's old NOCOLOR. Adjust it to correctly check whether it is set at all rather than to a specific value, to match the behavior of pytest itself. Signed-off-by: Michał Górny Signed-off-by: Sam James --- eclass/python-utils-r1.eclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 394f64a5d1399..da9cb820840f1 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1336,15 +1336,8 @@ epytest() { _python_check_EPYTHON _python_check_occluded_packages - local color - case ${NOCOLOR} in - true|yes) - color=no - ;; - *) - color=yes - ;; - esac + local color=yes + [[ ${NO_COLOR} ]] && color=no local args=( # verbose progress reporting and tracebacks From 21f4a98581ee8f6266c57cb19ea8e7a33dfa81a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 9 Dec 2023 19:38:31 +0100 Subject: [PATCH 4/7] python-utils-r1.eclass: Disable pytest-salt-factories by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny Signed-off-by: Sam James --- eclass/python-utils-r1.eclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index da9cb820840f1..188278f092129 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1382,6 +1382,8 @@ epytest() { -p no:pytest-describe -p no:plus -p no:tavern + # does something to logging + -p no:salt-factories ) fi From 786a1575c3be3d8680b2b4aec6254cbae90ab30d Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 11 Dec 2023 18:26:39 +0000 Subject: [PATCH 5/7] distutils-r1.eclass: workaround cython bug for Modern C Pass -Wno-error=incompatible-pointer-types for now to avoid many dupes for the same cython bug. Bug: https://github.com/cython/cython/issues/2747 Bug: https://bugs.gentoo.org/918983 Bug: https://bugs.gentoo.org/919261 Bug: https://bugs.gentoo.org/919277 Signed-off-by: Sam James --- eclass/distutils-r1.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 0a7b18e4a1a4f..6d2640b295983 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1806,6 +1806,11 @@ distutils-r1_run_phase() { tc-export AR CC CPP CXX if [[ ${DISTUTILS_EXT} ]]; then + if [[ ${BDEPEND} == *dev-python/cython* ]] ; then + # Workaround for https://github.com/cython/cython/issues/2747 (bug #918983) + local -x CFLAGS="${CFLAGS} $(test-flags-CC -Wno-error=incompatible-pointer-types)" + fi + local -x CPPFLAGS="${CPPFLAGS} $(usex debug '-UNDEBUG' '-DNDEBUG')" # always generate .c files from .pyx files to ensure we get latest # bug fixes from Cython (this works only when setup.py is using From cdc20ce0b81578b10b206f5a027cbbc9c3777f9f Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 11 Dec 2023 18:36:24 +0000 Subject: [PATCH 6/7] distutils-r1.eclass: mark DISTUTILS_EXT as @PRE_INHERIT We set DEPEND and IUSE based on it. Signed-off-by: Sam James --- eclass/distutils-r1.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 6d2640b295983..0a9815f2d4591 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -50,6 +50,7 @@ case ${EAPI} in esac # @ECLASS_VARIABLE: DISTUTILS_EXT +# @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # Set this variable to a non-null value if the package (possibly From 94e8e20b0fcbb930494c218faca39e84c6035bd6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 14 Dec 2023 05:22:40 +0000 Subject: [PATCH 7/7] python-utils-r1.eclass: fix EclassReservedName (drop obsolete ${EBUILD} old compat check) We introduced this in ddd9cd63e860ce71ad5f92e80a3e6e4be901af8a but it's UB to use ${EBUILD} and pkgcheck nowadays has OldPythonCompat for this. Bug: https://github.com/pkgcore/pkgcheck/issues/591 Signed-off-by: Sam James --- eclass/python-utils-r1.eclass | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 188278f092129..abb55bd2e9428 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -153,17 +153,6 @@ _python_set_impls() { done fi - if [[ -n ${obsolete[@]} && ${EBUILD_PHASE} == setup ]]; then - # complain if people don't clean up old impls while touching - # the ebuilds recently. use the copyright year to infer last - # modification - # NB: this check doesn't have to work reliably - if [[ $(head -n 1 "${EBUILD}" 2>/dev/null) == *2022* ]]; then - eqawarn "Please clean PYTHON_COMPAT of obsolete implementations:" - eqawarn " ${obsolete[*]}" - fi - fi - local supp=() unsupp=() for i in "${_PYTHON_ALL_IMPLS[@]}"; do