diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-23 08:58:35 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-23 08:58:35 +0100 |
| commit | 955b5fcaf4acc77c39a1f145d7c56e99f13083a7 (patch) | |
| tree | 1141703ebc6ca24ff935b991e261d716a5d98243 /eclass | |
| parent | 24c53d42e0294f4f6e36fbb051891af86c9ae503 (diff) | |
gentoo auto-resync : 23:05:2023 - 08:58:35
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37644 -> 37644 bytes | |||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 10 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 12 |
3 files changed, 15 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 124dd98ea329..6fe25d702a41 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz 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..635d49decbdd 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}" @@ -123,8 +123,8 @@ eindent test_var EPYTHON pypy3 pypy3 test_var PYTHON pypy3 /usr/bin/pypy3 if [[ -x /usr/bin/pypy3 ]]; then - test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.?/site-packages" - test_var PYTHON_INCLUDEDIR pypy3 "/usr/include/pypy3.?" + test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.*/site-packages" + test_var PYTHON_INCLUDEDIR pypy3 "/usr/include/pypy3.*" fi test_var PYTHON_PKG_DEP pypy3 '*dev-python/pypy3*:0=' test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 @@ -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}" |