From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23827138334 for ; Mon, 30 Dec 2019 12:59:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A17EE0BD2; Mon, 30 Dec 2019 12:59:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB550E0BD2 for ; Mon, 30 Dec 2019 12:59:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F056934DD54 for ; Mon, 30 Dec 2019 12:59:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D8257F for ; Mon, 30 Dec 2019 12:59:09 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1577710731.8844b4c200dc82d7d09547b3d913f011f05cf592.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/, eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-utils-r1.eclass eclass/tests/python-utils-r1.sh X-VCS-Directories: eclass/tests/ eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8844b4c200dc82d7d09547b3d913f011f05cf592 X-VCS-Branch: master Date: Mon, 30 Dec 2019 12:59:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c119b39e-78a1-4fd2-a265-1d6d728cf480 X-Archives-Hash: bf5c1297c908a66555d6abcd28f26ece commit: 8844b4c200dc82d7d09547b3d913f011f05cf592 Author: David Seifert gentoo org> AuthorDate: Mon Dec 30 00:48:32 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Dec 30 12:58:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8844b4c2 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 gentoo.org> Signed-off-by: Michał Górny 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 370898bcea0..09b501a4ad2 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 df77a3fcf6e..f8d4858da7c 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