commit:     f0f388d6e7b7990006384bd024ec5bf2d7f66737
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 00:48:32 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 12:58:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f388d6

python-utils-r1.eclass: Remove PYTHON_TARGETS="python3_5"

* Python 3.5 will go EOL on 2020-09-13 and in order to reduce testing
  and maintenance burden, we want to keep the number of active Py3
  impls below four.

  https://devguide.python.org/#status-of-python-branches

Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/python-utils-r1.eclass   | 6 +++---
 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 e0711a35e3a..370898bcea0 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -42,7 +42,7 @@ _PYTHON_ALL_IMPLS=(
        jython2_7
        pypy pypy3
        python2_7
-       python3_5 python3_6 python3_7 python3_8
+       python3_6 python3_7 python3_8
 )
 readonly _PYTHON_ALL_IMPLS
 
@@ -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_[5678]|jython2_7|pypy|pypy3)
+               python2_7|python3_[678]|jython2_7|pypy|pypy3)
                        return 0
                        ;;
-               pypy1_[89]|pypy2_0|python2_[56]|python3_[1234])
+               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 e883da38cea..df77a3fcf6e 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -181,7 +181,7 @@ test_is "_python_impl_supported python3_1" 1
 test_is "_python_impl_supported python3_2" 1
 test_is "_python_impl_supported python3_3" 1
 test_is "_python_impl_supported python3_4" 1
-test_is "_python_impl_supported python3_5" 0
+test_is "_python_impl_supported python3_5" 1
 test_is "_python_impl_supported python3_6" 0
 test_is "_python_impl_supported python3_7" 0
 test_is "_python_impl_supported python3_8" 0

Reply via email to