Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/
Date: Mon, 30 Dec 2019 12:59:17
Message-Id: 1577710732.b1b38d9aca3eb434c6a70bca37f4d41b847c3016.mgorny@gentoo
1 commit: b1b38d9aca3eb434c6a70bca37f4d41b847c3016
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 30 12:24:55 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 30 12:58:52 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b38d9a
7
8 python-utils-r1.eclass: Remove PYTHON_TARGETS="jython2_7"
9
10 Jython was supported as an experimental implementation but due to
11 interoperability issues and very slow development, its (re-)deployment
12 in ebuilds never took off. Now that Python 2.7 is going away, there's
13 no point in keeping its future support.
14
15 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
16
17 eclass/python-utils-r1.eclass | 5 ++---
18 eclass/tests/python-utils-r1.sh | 2 +-
19 2 files changed, 3 insertions(+), 4 deletions(-)
20
21 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
22 index 09b501a4ad2..301c9a029b5 100644
23 --- a/eclass/python-utils-r1.eclass
24 +++ b/eclass/python-utils-r1.eclass
25 @@ -39,7 +39,6 @@ inherit toolchain-funcs
26 # @DESCRIPTION:
27 # All supported Python implementations, most preferred last.
28 _PYTHON_ALL_IMPLS=(
29 - jython2_7
30 pypy3
31 python2_7
32 python3_6 python3_7 python3_8
33 @@ -78,10 +77,10 @@ _python_impl_supported() {
34 # keep in sync with _PYTHON_ALL_IMPLS!
35 # (not using that list because inline patterns shall be faster)
36 case "${impl}" in
37 - python2_7|python3_[678]|jython2_7|pypy3)
38 + python2_7|python3_[678]|pypy3)
39 return 0
40 ;;
41 - pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
42 + jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
43 return 1
44 ;;
45 *)
46
47 diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
48 index f8d4858da7c..4910b700308 100755
49 --- a/eclass/tests/python-utils-r1.sh
50 +++ b/eclass/tests/python-utils-r1.sh
51 @@ -190,7 +190,7 @@ test_is "_python_impl_supported pypy1_9" 1
52 test_is "_python_impl_supported pypy2_0" 1
53 test_is "_python_impl_supported pypy" 1
54 test_is "_python_impl_supported pypy3" 0
55 -test_is "_python_impl_supported jython2_7" 0
56 +test_is "_python_impl_supported jython2_7" 1
57
58 # check _python_impl_matches behavior
59 test_is "_python_impl_matches python2_7 -2" 0