diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-14 17:52:12 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-14 17:52:12 +0000 |
| commit | a90c84e720803f3d26c0ade8f1f1e405ca97502a (patch) | |
| tree | f788ea0972d51c66823825021dd83427e1d466c4 /eclass | |
| parent | 07c1e2fbaa2f7d2cad4c16a747cebcf7ae7a6724 (diff) | |
gentoo auto-resync : 14:01:2023 - 17:52:11
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37525 -> 37523 bytes | |||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 10 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 17 |
3 files changed, 14 insertions, 13 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 18b7e75ae333..3ef5872c3985 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 83bf5d035c4a..43472bd1fae0 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_{8..11} + python3_{9..11} ) readonly _PYTHON_ALL_IMPLS @@ -52,7 +52,7 @@ _PYTHON_HISTORICAL_IMPLS=( jython2_7 pypy pypy1_{8,9} pypy2_0 python2_{5..7} - python3_{1..7} + python3_{1..8} ) readonly _PYTHON_HISTORICAL_IMPLS @@ -129,9 +129,9 @@ _python_set_impls() { # please keep them in sync with _PYTHON_ALL_IMPLS # and _PYTHON_HISTORICAL_IMPLS case ${i} in - pypy3|python3_[89]|python3_1[01]) + pypy3|python3_9|python3_1[01]) ;; - jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-7]) + jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-8]) obsolete+=( "${i}" ) ;; *) @@ -440,8 +440,6 @@ _python_export() { PYTHON_PKG_DEP) local d case ${impl} in - python3.8) - PYTHON_PKG_DEP=">=dev-lang/python-3.8.16:3.8";; python3.9) PYTHON_PKG_DEP=">=dev-lang/python-3.9.16:3.9";; python3.10) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 6a1d2f98cbf9..9d37bf0b24d0 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -64,7 +64,7 @@ tmpfile=$(mktemp) inherit python-utils-r1 -for minor in 8 9 10 11; do +for minor in 9 10 11; do ebegin "Testing python3.${minor}" eindent test_var EPYTHON "python3_${minor}" "python3.${minor}" @@ -199,15 +199,18 @@ test_is "_python_impl_matches python3_6 python*" 0 test_is "_python_impl_matches python3_7 python*" 0 test_is "_python_impl_matches pypy3 python*" 1 set +f -test_is "_python_impl_matches python3_8 3.8" 0 -test_is "_python_impl_matches python3_8 3.9" 1 -test_is "_python_impl_matches python3_8 3.10" 1 -test_is "_python_impl_matches python3_9 3.8" 1 test_is "_python_impl_matches python3_9 3.9" 0 test_is "_python_impl_matches python3_9 3.10" 1 -test_is "_python_impl_matches pypy3 3.8" 1 +test_is "_python_impl_matches python3_9 3.11" 1 +test_is "_python_impl_matches python3_10 3.9" 1 +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_11 3.9" 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 pypy3 3.9" 0 test_is "_python_impl_matches pypy3 3.10" 1 +test_is "_python_impl_matches pypy3 3.11" 1 eoutdent rm "${tmpfile}" |