From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 832B715810D for ; Tue, 23 May 2023 04:36:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85F70E0971; Tue, 23 May 2023 04:36:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A869E0971 for ; Tue, 23 May 2023 04:36:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C4D533BDF4 for ; Tue, 23 May 2023 04:36:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90687A78 for ; Tue, 23 May 2023 04:36:39 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1684816592.a118f0e456077da2052c8b3cde8f7b6f55bb78fb.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass eclass/tests/python-utils-r1.sh X-VCS-Directories: eclass/tests/ eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a118f0e456077da2052c8b3cde8f7b6f55bb78fb X-VCS-Branch: master Date: Tue, 23 May 2023 04:36:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a774adfd-b566-4040-8515-6b320ba24b9d X-Archives-Hash: 30d551b2dabfcf24d033f4425653ff78 commit: a118f0e456077da2052c8b3cde8f7b6f55bb78fb Author: Michał Górny gentoo org> AuthorDate: Tue May 23 04:00:58 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue May 23 04:36:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a118f0e4 python-utils-r1.eclass: Add python3_12 target Signed-off-by: Michał Górny gentoo.org> eclass/python-utils-r1.eclass | 10 ++++++---- eclass/tests/python-utils-r1.sh | 8 +++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 040d374bbfe0..d21e54c6ecc9 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -40,7 +40,7 @@ inherit multiprocessing toolchain-funcs # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( pypy3 - python3_{10..11} + python3_{10..12} ) readonly _PYTHON_ALL_IMPLS @@ -80,7 +80,7 @@ _python_verify_patterns() { local impl pattern for pattern; do case ${pattern} in - -[23]|3.[89]|3.1[01]) + -[23]|3.[89]|3.1[012]) continue ;; esac @@ -129,7 +129,7 @@ _python_set_impls() { # please keep them in sync with _PYTHON_ALL_IMPLS # and _PYTHON_HISTORICAL_IMPLS case ${i} in - pypy3|python3_9|python3_1[01]) + pypy3|python3_9|python3_1[0-2]) ;; jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9]) obsolete+=( "${i}" ) @@ -236,7 +236,7 @@ _python_impl_matches() { [[ ${impl} == python${pattern/./_} || ${impl} == pypy3 ]] && return 0 ;; - 3.8|3.1[01]) + 3.8|3.1[0-2]) [[ ${impl} == python${pattern/./_} ]] && return 0 ;; *) @@ -444,6 +444,8 @@ _python_export() { PYTHON_PKG_DEP=">=dev-lang/python-3.10.9-r1:3.10";; python3.11) PYTHON_PKG_DEP=">=dev-lang/python-3.11.1-r1:3.11";; + python3.12) + PYTHON_PKG_DEP=">=dev-lang/python-3.12.0_beta1:3.12";; pypy3) PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.11-r1:0=';; *) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index d8b414219704..ee09ae2c877c 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -64,7 +64,7 @@ tmpfile=$(mktemp) inherit python-utils-r1 -for minor in 10 11; do +for minor in {10..12}; do ebegin "Testing python3.${minor}" eindent test_var EPYTHON "python3_${minor}" "python3.${minor}" @@ -201,10 +201,16 @@ test_is "_python_impl_matches pypy3 python*" 1 set +f test_is "_python_impl_matches python3_10 3.10" 0 test_is "_python_impl_matches python3_10 3.11" 1 +test_is "_python_impl_matches python3_10 3.12" 1 test_is "_python_impl_matches python3_11 3.10" 1 test_is "_python_impl_matches python3_11 3.11" 0 +test_is "_python_impl_matches python3_11 3.12" 1 +test_is "_python_impl_matches python3_12 3.10" 1 +test_is "_python_impl_matches python3_12 3.11" 1 +test_is "_python_impl_matches python3_12 3.12" 0 test_is "_python_impl_matches pypy3 3.10" 1 test_is "_python_impl_matches pypy3 3.11" 1 +test_is "_python_impl_matches pypy3 3.12" 1 eoutdent rm "${tmpfile}"