commit: 69b674e49e70369b4a5da3a958f4e1556d6b01f7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 11:16:16 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 11:16:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b674e4
python-utils-r1.eclass: remove py3.8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-portage/gpyutils/files/implementations.txt | 2 +-
eclass/python-utils-r1.eclass | 10 ++++------
eclass/tests/python-utils-r1.sh | 17 ++++++++++-------
profiles/base/package.use.force | 3 +--
profiles/desc/python_single_target.desc | 3 +--
profiles/desc/python_targets.desc | 3 +--
6 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/app-portage/gpyutils/files/implementations.txt
b/app-portage/gpyutils/files/implementations.txt
index 88202c6748a3..ab471bfc7b49 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -17,7 +17,7 @@ python3_4 dead 3.4
python3_5 dead 3.5
python3_6 dead 3.6
python3_7 dead 3.7
-python3_8 old 3.8
+python3_8 dead 3.8
python3_9 old 3.9
python3_10 current 3.10
python3_11 supported 3.11
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 83bf5d035c4a..43472bd1fae0 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -40,7 +40,7 @@ inherit multiprocessing toolchain-funcs
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
pypy3
- python3_{8..11}
+ python3_{9..11}
)
readonly _PYTHON_ALL_IMPLS
@@ -52,7 +52,7 @@ _PYTHON_HISTORICAL_IMPLS=(
jython2_7
pypy pypy1_{8,9} pypy2_0
python2_{5..7}
- python3_{1..7}
+ python3_{1..8}
)
readonly _PYTHON_HISTORICAL_IMPLS
@@ -129,9 +129,9 @@ _python_set_impls() {
# please keep them in sync with _PYTHON_ALL_IMPLS
# and _PYTHON_HISTORICAL_IMPLS
case ${i} in
- pypy3|python3_[89]|python3_1[01])
+ pypy3|python3_9|python3_1[01])
;;
-
jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-7])
+
jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-8])
obsolete+=( "${i}" )
;;
*)
@@ -440,8 +440,6 @@ _python_export() {
PYTHON_PKG_DEP)
local d
case ${impl} in
- python3.8)
-
PYTHON_PKG_DEP=">=dev-lang/python-3.8.16:3.8";;
python3.9)
PYTHON_PKG_DEP=">=dev-lang/python-3.9.16:3.9";;
python3.10)
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 6a1d2f98cbf9..9d37bf0b24d0 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -64,7 +64,7 @@ tmpfile=$(mktemp)
inherit python-utils-r1
-for minor in 8 9 10 11; do
+for minor in 9 10 11; do
ebegin "Testing python3.${minor}"
eindent
test_var EPYTHON "python3_${minor}" "python3.${minor}"
@@ -199,15 +199,18 @@ 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
set +f
-test_is "_python_impl_matches python3_8 3.8" 0
-test_is "_python_impl_matches python3_8 3.9" 1
-test_is "_python_impl_matches python3_8 3.10" 1
-test_is "_python_impl_matches python3_9 3.8" 1
test_is "_python_impl_matches python3_9 3.9" 0
test_is "_python_impl_matches python3_9 3.10" 1
-test_is "_python_impl_matches pypy3 3.8" 1
+test_is "_python_impl_matches python3_9 3.11" 1
+test_is "_python_impl_matches python3_10 3.9" 1
+test_is "_python_impl_matches python3_10 3.10" 0
+test_is "_python_impl_matches python3_10 3.11" 1
+test_is "_python_impl_matches python3_11 3.9" 1
+test_is "_python_impl_matches python3_11 3.10" 1
+test_is "_python_impl_matches python3_11 3.11" 0
test_is "_python_impl_matches pypy3 3.9" 0
test_is "_python_impl_matches pypy3 3.10" 1
+test_is "_python_impl_matches pypy3 3.11" 1
eoutdent
rm "${tmpfile}"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index fbce620680a2..7521686e4e29 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Matt Turner <matts...@gentoo.org> (2022-12-02)
@@ -213,7 +213,6 @@ app-shells/bash:0 readline
# Michał Górny <mgo...@gentoo.org> (2012-10-14)
# Force-enable all PYTHON_TARGETS for python-exec to avoid using private
# API. Please remember to keep it in sync with python_targets.desc.
-dev-lang/python-exec python_targets_python3_8
dev-lang/python-exec python_targets_python3_9
dev-lang/python-exec python_targets_python3_10
dev-lang/python-exec python_targets_python3_11
diff --git a/profiles/desc/python_single_target.desc
b/profiles/desc/python_single_target.desc
index 6c978694943c..e0f1bed263a1 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors.
+# Copyright 1999-2023 Gentoo Authors.
# Distributed under the terms of the GNU General Public License v2
# This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
-python3_8 - Build for Python 3.8 only
python3_9 - Build for Python 3.9 only
python3_10 - Build for Python 3.10 only
python3_11 - Build for Python 3.11 only
diff --git a/profiles/desc/python_targets.desc
b/profiles/desc/python_targets.desc
index ad77fbf5b60f..7b5841ecd4b3 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors.
+# Copyright 1999-2023 Gentoo Authors.
# Distributed under the terms of the GNU General Public License v2
# This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
-python3_8 - Build with Python 3.8
python3_9 - Build with Python 3.9
python3_10 - Build with Python 3.10
python3_11 - Build with Python 3.11
