| 1 |
commit: 8844b4c200dc82d7d09547b3d913f011f05cf592 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 30 00:48:32 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 30 12:58:51 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8844b4c2 |
| 7 |
|
| 8 |
python-utils-r1.eclass: Remove PYTHON_TARGETS="pypy" |
| 9 |
|
| 10 |
* With the EOL of CPython 2, we also want to |
| 11 |
remove support for PyPy (i.e. PyPy for Python 2). |
| 12 |
This change does not affect PyPy3, i.e. Pypy for |
| 13 |
Python 3. |
| 14 |
|
| 15 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 16 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 17 |
|
| 18 |
eclass/python-utils-r1.eclass | 6 +++--- |
| 19 |
eclass/tests/python-utils-r1.sh | 2 +- |
| 20 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
| 23 |
index 370898bcea0..09b501a4ad2 100644 |
| 24 |
--- a/eclass/python-utils-r1.eclass |
| 25 |
+++ b/eclass/python-utils-r1.eclass |
| 26 |
@@ -40,7 +40,7 @@ inherit toolchain-funcs |
| 27 |
# All supported Python implementations, most preferred last. |
| 28 |
_PYTHON_ALL_IMPLS=( |
| 29 |
jython2_7 |
| 30 |
- pypy pypy3 |
| 31 |
+ pypy3 |
| 32 |
python2_7 |
| 33 |
python3_6 python3_7 python3_8 |
| 34 |
) |
| 35 |
@@ -78,10 +78,10 @@ _python_impl_supported() { |
| 36 |
# keep in sync with _PYTHON_ALL_IMPLS! |
| 37 |
# (not using that list because inline patterns shall be faster) |
| 38 |
case "${impl}" in |
| 39 |
- python2_7|python3_[678]|jython2_7|pypy|pypy3) |
| 40 |
+ python2_7|python3_[678]|jython2_7|pypy3) |
| 41 |
return 0 |
| 42 |
;; |
| 43 |
- pypy1_[89]|pypy2_0|python2_[56]|python3_[12345]) |
| 44 |
+ pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345]) |
| 45 |
return 1 |
| 46 |
;; |
| 47 |
*) |
| 48 |
|
| 49 |
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh |
| 50 |
index df77a3fcf6e..f8d4858da7c 100755 |
| 51 |
--- a/eclass/tests/python-utils-r1.sh |
| 52 |
+++ b/eclass/tests/python-utils-r1.sh |
| 53 |
@@ -188,7 +188,7 @@ test_is "_python_impl_supported python3_8" 0 |
| 54 |
test_is "_python_impl_supported pypy1_8" 1 |
| 55 |
test_is "_python_impl_supported pypy1_9" 1 |
| 56 |
test_is "_python_impl_supported pypy2_0" 1 |
| 57 |
-test_is "_python_impl_supported pypy" 0 |
| 58 |
+test_is "_python_impl_supported pypy" 1 |
| 59 |
test_is "_python_impl_supported pypy3" 0 |
| 60 |
test_is "_python_impl_supported jython2_7" 0 |
Archives