From aac2f8223e392b4a1d53b66ad5172e528c625f2b Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 1 Jul 2025 01:55:25 +0100 Subject: 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 --- ci/ciimage/gentoo/install.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ci/ciimage/gentoo/install.sh b/ci/ciimage/gentoo/install.sh index 700e4e9db..584584e8e 100755 --- a/ci/ciimage/gentoo/install.sh +++ b/ci/ciimage/gentoo/install.sh @@ -70,7 +70,6 @@ pkgs_stable=( #x11-libs/gtk+:3 ) pkgs_latest=( - # ~arch boost needed for py3.12 for now (needs 1.84) dev-build/b2 dev-libs/boost @@ -134,17 +133,20 @@ cat <<-EOF >> /etc/portage/make.conf FEATURES="\${FEATURES} -ipc-sandbox -network-sandbox -pid-sandbox" EOF -# TODO: Enable all Pythons / add multiple jobs with diff. Python impls? +# Maybe we could enable all Pythons / add multiple jobs with diff. Python impls? #echo '*/* PYTHON_TARGETS: python3_10 python3_11 python3_12' >> /etc/portage/package.use/python -echo '*/* PYTHON_TARGETS: python3_12' >> /etc/portage/package.use/python -cat <<-EOF >> /etc/portage/profile/use.mask --python_targets_python3_12 --python_single_target_python3_12 -EOF -cat <<-EOF >> /etc/portage/profile/use.stable.mask --python_targets_python3_12 --python_single_target_python3_12 -EOF + +# The below is for cases where we want non-default Python (either to get +# better coverage from something older, or something newer) +#echo '*/* PYTHON_TARGETS: python3_12' >> /etc/portage/package.use/python +#cat <<-EOF >> /etc/portage/profile/use.mask +#-python_targets_python3_12 +#-python_single_target_python3_12 +#EOF +#cat <<-EOF >> /etc/portage/profile/use.stable.mask +#-python_targets_python3_12 +#-python_single_target_python3_12 +#EOF echo 'dev-lang/python ensurepip' >> /etc/portage/package.use/python -- cgit v1.2.3