summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-12-30 01:48:32 +0100
committerMichał Górny <mgorny@gentoo.org>2019-12-30 13:58:51 +0100
commit8844b4c200dc82d7d09547b3d913f011f05cf592 (patch)
treeccd37802a99e08e9bac87816a299cd442b2ae1e6
parentpython-utils-r1.eclass: Remove PYTHON_TARGETS="python3_5" (diff)
downloadgentoo-8844b4c200dc82d7d09547b3d913f011f05cf592.tar.gz
gentoo-8844b4c200dc82d7d09547b3d913f011f05cf592.tar.bz2
gentoo-8844b4c200dc82d7d09547b3d913f011f05cf592.zip
python-utils-r1.eclass: Remove PYTHON_TARGETS="pypy"
* With the EOL of CPython 2, we also want to remove support for PyPy (i.e. PyPy for Python 2). This change does not affect PyPy3, i.e. Pypy for Python 3. Signed-off-by: David Seifert <soap@gentoo.org> Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--eclass/python-utils-r1.eclass6
-rwxr-xr-xeclass/tests/python-utils-r1.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 370898bcea00..09b501a4ad24 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -40,7 +40,7 @@ inherit toolchain-funcs
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_7
- pypy pypy3
+ pypy3
python2_7
python3_6 python3_7 python3_8
)
@@ -78,10 +78,10 @@ _python_impl_supported() {
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_7|python3_[678]|jython2_7|pypy|pypy3)
+ python2_7|python3_[678]|jython2_7|pypy3)
return 0
;;
- pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
+ pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
return 1
;;
*)
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index df77a3fcf6ec..f8d4858da7cc 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -188,7 +188,7 @@ test_is "_python_impl_supported python3_8" 0
test_is "_python_impl_supported pypy1_8" 1
test_is "_python_impl_supported pypy1_9" 1
test_is "_python_impl_supported pypy2_0" 1
-test_is "_python_impl_supported pypy" 0
+test_is "_python_impl_supported pypy" 1
test_is "_python_impl_supported pypy3" 0
test_is "_python_impl_supported jython2_7" 0