Skip to content

Commit aac2f82

Browse files
committed
ci: gentoo: cleanup old Python commentary/entries
This dates back to before we changed to Python 3.12 default in Gentoo. I don't remember why we specifically wanted/needed 3.12 in the CI builder though (maybe something to do with distutils removal to test that). The Python changes here shouldn't make much difference to binpkg eligibility right now because the binhost has a double builder for old targets, though it won't cover everything. Signed-off-by: Sam James <sam@gentoo.org>
1 parent cdd6a3d commit aac2f82

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

ci/ciimage/gentoo/install.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ pkgs_stable=(
7070
#x11-libs/gtk+:3
7171
)
7272
pkgs_latest=(
73-
# ~arch boost needed for py3.12 for now (needs 1.84)
7473
dev-build/b2
7574
dev-libs/boost
7675

@@ -134,17 +133,20 @@ cat <<-EOF >> /etc/portage/make.conf
134133
FEATURES="\${FEATURES} -ipc-sandbox -network-sandbox -pid-sandbox"
135134
EOF
136135

137-
# TODO: Enable all Pythons / add multiple jobs with diff. Python impls?
136+
# Maybe we could enable all Pythons / add multiple jobs with diff. Python impls?
138137
#echo '*/* PYTHON_TARGETS: python3_10 python3_11 python3_12' >> /etc/portage/package.use/python
139-
echo '*/* PYTHON_TARGETS: python3_12' >> /etc/portage/package.use/python
140-
cat <<-EOF >> /etc/portage/profile/use.mask
141-
-python_targets_python3_12
142-
-python_single_target_python3_12
143-
EOF
144-
cat <<-EOF >> /etc/portage/profile/use.stable.mask
145-
-python_targets_python3_12
146-
-python_single_target_python3_12
147-
EOF
138+
139+
# The below is for cases where we want non-default Python (either to get
140+
# better coverage from something older, or something newer)
141+
#echo '*/* PYTHON_TARGETS: python3_12' >> /etc/portage/package.use/python
142+
#cat <<-EOF >> /etc/portage/profile/use.mask
143+
#-python_targets_python3_12
144+
#-python_single_target_python3_12
145+
#EOF
146+
#cat <<-EOF >> /etc/portage/profile/use.stable.mask
147+
#-python_targets_python3_12
148+
#-python_single_target_python3_12
149+
#EOF
148150

149151
echo 'dev-lang/python ensurepip' >> /etc/portage/package.use/python
150152

0 commit comments

Comments
 (0)