From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/
Date: Fri, 31 Dec 2021 09:10:11 +0000 (UTC) [thread overview]
Message-ID: <1640941774.7d07fee32109260cfa3018c29a3a45d589a82d60.mgorny@gentoo> (raw)
commit: 7d07fee32109260cfa3018c29a3a45d589a82d60
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 09:09:34 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 09:09:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d07fee3
eclass/tests/python-utils-r1.sh: Remove obsoletep py2 usage
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
eclass/tests/python-utils-r1.sh | 46 ++++++++++-------------------------------
1 file changed, 11 insertions(+), 35 deletions(-)
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 1cd5cdbf6c0a..7ba4a864ff10 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -162,68 +162,44 @@ test_is "python_is_python3 pypy" 1
test_is "python_is_python3 pypy3" 0
# generic shebangs
-test_fix_shebang '#!/usr/bin/python' python2.7 '#!/usr/bin/python2.7'
test_fix_shebang '#!/usr/bin/python' python3.6 '#!/usr/bin/python3.6'
test_fix_shebang '#!/usr/bin/python' pypy3 '#!/usr/bin/pypy3'
# python2/python3 matching
-test_fix_shebang '#!/usr/bin/python2' python2.7 '#!/usr/bin/python2.7'
-test_fix_shebang '#!/usr/bin/python3' python2.7 FAIL
-test_fix_shebang '#!/usr/bin/python3' python2.7 '#!/usr/bin/python2.7' --force
test_fix_shebang '#!/usr/bin/python3' python3.6 '#!/usr/bin/python3.6'
test_fix_shebang '#!/usr/bin/python2' python3.6 FAIL
test_fix_shebang '#!/usr/bin/python2' python3.6 '#!/usr/bin/python3.6' --force
# pythonX.Y matching (those mostly test the patterns)
-test_fix_shebang '#!/usr/bin/python2.7' python2.7 '#!/usr/bin/python2.7'
test_fix_shebang '#!/usr/bin/python2.7' python3.2 FAIL
test_fix_shebang '#!/usr/bin/python2.7' python3.2 '#!/usr/bin/python3.2' --force
test_fix_shebang '#!/usr/bin/python3.2' python3.2 '#!/usr/bin/python3.2'
-test_fix_shebang '#!/usr/bin/python3.2' python2.7 FAIL
-test_fix_shebang '#!/usr/bin/python3.2' python2.7 '#!/usr/bin/python2.7' --force
-test_fix_shebang '#!/usr/bin/pypy' python2.7 FAIL
-test_fix_shebang '#!/usr/bin/pypy' python2.7 '#!/usr/bin/python2.7' --force
# fancy path handling
test_fix_shebang '#!/mnt/python2/usr/bin/python' python3.6 \
'#!/mnt/python2/usr/bin/python3.6'
-test_fix_shebang '#!/mnt/python2/usr/bin/python2' python2.7 \
- '#!/mnt/python2/usr/bin/python2.7'
-test_fix_shebang '#!/mnt/python2/usr/bin/env python' python2.7 \
- '#!/mnt/python2/usr/bin/env python2.7'
-test_fix_shebang '#!/mnt/python2/usr/bin/python2 python2' python2.7 \
- '#!/mnt/python2/usr/bin/python2.7 python2'
-test_fix_shebang '#!/mnt/python2/usr/bin/python3 python2' python2.7 FAIL
-test_fix_shebang '#!/mnt/python2/usr/bin/python3 python2' python2.7 \
- '#!/mnt/python2/usr/bin/python2.7 python2' --force
-test_fix_shebang '#!/usr/bin/foo' python2.7 FAIL
+test_fix_shebang '#!/mnt/python2/usr/bin/python3' python3.8 \
+ '#!/mnt/python2/usr/bin/python3.8'
+test_fix_shebang '#!/mnt/python2/usr/bin/env python' python3.8 \
+ '#!/mnt/python2/usr/bin/env python3.8'
+test_fix_shebang '#!/mnt/python2/usr/bin/python3 python3' python3.8 \
+ '#!/mnt/python2/usr/bin/python3.8 python3'
+test_fix_shebang '#!/mnt/python2/usr/bin/python2 python3' python3.8 FAIL
+test_fix_shebang '#!/mnt/python2/usr/bin/python2 python3' python3.8 \
+ '#!/mnt/python2/usr/bin/python3.8 python3' --force
+test_fix_shebang '#!/usr/bin/foo' python3.8 FAIL
# regression test for bug #522080
-test_fix_shebang '#!/usr/bin/python ' python2.7 '#!/usr/bin/python2.7 '
+test_fix_shebang '#!/usr/bin/python ' python3.8 '#!/usr/bin/python3.8 '
# check _python_impl_matches behavior
-test_is "_python_impl_matches python2_7 -2" 0
-test_is "_python_impl_matches python3_6 -2" 1
-test_is "_python_impl_matches python3_7 -2" 1
-test_is "_python_impl_matches pypy3 -2" 1
-test_is "_python_impl_matches python2_7 -3" 1
test_is "_python_impl_matches python3_6 -3" 0
test_is "_python_impl_matches python3_7 -3" 0
test_is "_python_impl_matches pypy3 -3" 0
-test_is "_python_impl_matches python2_7 -2 python3_6" 0
-test_is "_python_impl_matches python3_6 -2 python3_6" 0
-test_is "_python_impl_matches python3_7 -2 python3_6" 1
-test_is "_python_impl_matches pypy3 -2 python3_6" 1
-test_is "_python_impl_matches python2_7 pypy3 -2 python3_6" 0
-test_is "_python_impl_matches python3_6 pypy3 -2 python3_6" 0
-test_is "_python_impl_matches python3_7 pypy3 -2 python3_6" 1
-test_is "_python_impl_matches pypy3 pypy3 -2 python3_6" 0
set -f
-test_is "_python_impl_matches python2_7 pypy*" 1
test_is "_python_impl_matches python3_6 pypy*" 1
test_is "_python_impl_matches python3_7 pypy*" 1
test_is "_python_impl_matches pypy3 pypy*" 0
-test_is "_python_impl_matches python2_7 python*" 0
test_is "_python_impl_matches python3_6 python*" 0
test_is "_python_impl_matches python3_7 python*" 0
test_is "_python_impl_matches pypy3 python*" 1
next reply other threads:[~2021-12-31 9:10 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-31 9:10 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-30 11:35 [gentoo-commits] repo/gentoo:master commit in: eclass/tests/ Michał Górny
2024-12-30 11:35 Michał Górny
2024-12-21 8:11 Michał Górny
2024-12-20 20:39 Michał Górny
2024-12-20 20:39 Michał Górny
2024-12-09 18:49 Ulrich Müller
2024-09-19 4:13 Sam James
2024-09-18 15:51 Sam James
2024-09-18 15:51 Sam James
2024-08-07 8:58 Andrew Ammerlaan
2024-08-07 8:58 Andrew Ammerlaan
2024-08-06 8:47 Michał Górny
2024-08-06 8:47 Michał Górny
2024-07-29 17:02 Michał Górny
2024-07-28 9:32 Ulrich Müller
2024-06-13 19:53 Ulrich Müller
2024-06-13 19:53 Ulrich Müller
2024-06-13 18:35 Ulrich Müller
2024-06-13 18:35 Ulrich Müller
2024-06-12 16:47 Ulrich Müller
2024-06-12 15:35 Michał Górny
2024-06-12 15:32 Ulrich Müller
2024-06-12 9:47 Ulrich Müller
2024-05-25 8:24 Ulrich Müller
2023-11-03 19:00 Michał Górny
2023-09-14 5:30 Michał Górny
2023-06-18 14:57 Michał Górny
2023-06-17 10:10 Michał Górny
2023-06-15 12:19 Michał Górny
2023-05-23 4:36 Michał Górny
2023-05-01 13:43 Sam James
2023-04-20 23:14 Sam James
2022-12-14 10:18 Michał Górny
2022-10-28 8:24 Michał Górny
2022-10-15 17:35 Mike Gilbert
2022-10-10 20:52 Michał Górny
2022-10-01 17:19 Michał Górny
2022-10-01 17:19 Michał Górny
2022-09-27 20:28 Michał Górny
2022-05-09 20:33 Michał Górny
2022-05-09 20:33 Michał Górny
2022-04-21 15:19 Michał Górny
2022-04-19 21:32 Mike Gilbert
2022-02-14 21:13 Mike Gilbert
2022-02-14 17:25 Mike Gilbert
2021-12-31 9:10 Michał Górny
2021-12-31 9:10 Michał Górny
2021-06-22 20:44 David Seifert
2021-05-12 20:55 Mike Gilbert
2021-05-12 19:39 Michał Górny
2021-05-05 18:20 Michał Górny
2021-03-28 11:48 Michał Górny
2020-11-23 18:11 Ulrich Müller
2020-07-02 8:29 Michał Górny
2020-07-02 8:29 Michał Górny
2020-07-02 8:29 Michał Górny
2020-07-02 8:29 Michał Górny
2020-06-19 11:52 Michał Górny
2020-05-28 11:41 Michał Górny
2020-05-10 1:02 Sergei Trofimovich
2020-04-30 9:45 Michał Górny
2020-04-19 16:47 Michał Górny
2020-03-30 13:11 Michał Górny
2020-03-30 11:57 Michał Górny
2020-03-27 23:54 Sergei Trofimovich
2020-02-27 16:29 Michał Górny
2020-02-09 18:09 Michał Górny
2019-12-23 11:47 Sergei Trofimovich
2019-12-13 22:37 Sergei Trofimovich
2019-12-07 16:59 Michał Górny
2019-12-01 11:29 Sergei Trofimovich
2019-11-24 15:09 Michał Górny
2019-11-20 20:30 Sergei Trofimovich
2019-11-20 19:51 Sergei Trofimovich
2019-11-20 9:23 Michał Górny
2019-11-20 9:16 Michał Górny
2019-11-20 9:15 Michał Górny
2019-11-20 9:00 Michał Górny
2019-11-20 9:00 Michał Górny
2019-11-20 9:00 Michał Górny
2019-11-20 8:46 Michał Górny
2019-11-20 8:46 Michał Górny
2019-11-20 8:46 Michał Górny
2019-11-20 7:47 Michał Górny
2019-11-06 22:44 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2018-12-09 20:32 Sergei Trofimovich
2017-09-19 13:15 Michał Górny
2017-09-14 19:05 Mike Gilbert
2017-08-08 19:42 Michał Górny
2017-04-14 16:28 Michał Górny
2017-03-08 7:35 Michał Górny
2016-06-27 5:58 Michał Górny
2016-01-08 5:14 Michał Górny
2015-12-09 20:42 Michał Górny
2015-11-21 19:58 Ulrich Müller
2015-11-12 16:03 Michał Górny
2015-11-11 10:27 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1640941774.7d07fee32109260cfa3018c29a3a45d589a82d60.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox