diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-01 17:20:35 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-01 17:20:35 +0100 |
| commit | a88eb1d9b7042912d196e255eeb20e0c77f6cf47 (patch) | |
| tree | 291cc788e33b3de8bf1b5e3f1fdddf315f2f5ee7 /eclass | |
| parent | c3d14fe9accdf0b091e42f26a66ed7626ba8c24b (diff) | |
gentoo auto-resync : 01:05:2023 - 17:20:35
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37474 -> 37484 bytes | |||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 8 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex c21e286cd868..5a9e525889e8 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index be2183463550..040d374bbfe0 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_{9..11} + python3_{10..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..8} + python3_{1..9} ) readonly _PYTHON_HISTORICAL_IMPLS @@ -131,7 +131,7 @@ _python_set_impls() { case ${i} in pypy3|python3_9|python3_1[01]) ;; - jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-8]) + jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9]) obsolete+=( "${i}" ) ;; *) @@ -440,8 +440,6 @@ _python_export() { PYTHON_PKG_DEP) local d case ${impl} in - python3.9) - PYTHON_PKG_DEP=">=dev-lang/python-3.9.16-r1:3.9";; python3.10) PYTHON_PKG_DEP=">=dev-lang/python-3.10.9-r1:3.10";; python3.11) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 9d37bf0b24d0..d8b414219704 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 9 10 11; do +for minor in 10 11; do ebegin "Testing python3.${minor}" eindent test_var EPYTHON "python3_${minor}" "python3.${minor}" @@ -199,16 +199,10 @@ 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_9 3.9" 0 -test_is "_python_impl_matches python3_9 3.10" 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 |