diff options
author | Michał Górny <mgorny@gentoo.org> | 2023-06-23 08:10:46 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2023-07-02 17:06:27 +0200 |
commit | 6d9ca31b20ed4a4d7130602e67aa61385f8511e0 (patch) | |
tree | f831ee69ab0a633764f836a7f414c4e8852790a5 /eclass | |
parent | dev-libs/glib: Stabilize 2.76.3 amd64, #909467 (diff) | |
download | gentoo-6d9ca31b20ed4a4d7130602e67aa61385f8511e0.tar.gz gentoo-6d9ca31b20ed4a4d7130602e67aa61385f8511e0.tar.bz2 gentoo-6d9ca31b20ed4a4d7130602e67aa61385f8511e0.zip |
python-utils-r1.eclass: make pypy3 match Python 3.10 now
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/python-utils-r1.eclass | 6 | ||||
-rwxr-xr-x | eclass/tests/python-utils-r1.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 7a1be381f596..d2bbe90da049 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -238,12 +238,12 @@ _python_impl_matches() { fi return 0 ;; - 3.9) - # the only unmasked pypy3 version is pypy3.9 atm + 3.9|3.10) + # <pypy3-7.3.12 is 3.9, >=7.3.12 is 3.10 [[ ${impl} == python${pattern/./_} || ${impl} == pypy3 ]] && return 0 ;; - 3.8|3.1[0-2]) + 3.8|3.1[1-2]) [[ ${impl} == python${pattern/./_} ]] && return 0 ;; *) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 635d49decbdd..81c459765f0f 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -208,7 +208,7 @@ 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.10" 0 test_is "_python_impl_matches pypy3 3.11" 1 test_is "_python_impl_matches pypy3 3.12" 1 eoutdent |