From 48e842f66ba7ca4937e85e701421d42dd821c36a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 24 Jan 2023 12:26:37 +0100 Subject: [PATCH] profiles: Switch to python 3.10 --- .../profiles/coreos/base/make.defaults | 8 ++++---- .../coreos-overlay/profiles/coreos/base/package.mask | 4 ++-- .../coreos-overlay/profiles/coreos/base/use.mask | 12 +++++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index f390955959..b73c719c5c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -14,12 +14,12 @@ USE_EXPAND="${USE_EXPAND} GO_VERSION" USE="${USE} cros_host expat -cracklib -introspection -cups -tcpd -berkdb" # Use Python 3 as the default version -USE="${USE} -python_single_target_python2_7 python_single_target_python3_9" -USE="${USE} -python_targets_python2_7 python_targets_python3_9" +USE="${USE} -python_single_target_python2_7 python_single_target_python3_10" +USE="${USE} -python_targets_python2_7 python_targets_python3_10" # Use Python 3 as the default version -BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_python2_7 python_single_target_python3_9" -BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_python2_7 python_targets_python3_9" +BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_python2_7 python_single_target_python3_10" +BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_python2_7 python_targets_python3_10" # Never install cron or cron jobs USE="${USE} -cron" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 68d088c019..1b1e176a90 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -18,9 +18,9 @@ # version 10 or later. >=virtual/libcrypt-2 -# Python 3.10 is stable in portage-stable, so avoid picking it +# Python 3.11 is stable in portage-stable, so avoid picking it # up. Drop this when we switch to it. ->=dev-lang/python-3.10 +>=dev-lang/python-3.11 # sys-devel/gcc-11.3.1_p20221209 is the latest gcc version that is # stable on both amd64 and arm64. There are newer versions of gcc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask index 6e03cd1800..56ea60f1a8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask @@ -1,17 +1,15 @@ # Never enable experimental code kdbus -# We default to python 3.9 for now +# We default to python 3.10 for now python_targets_python2_7 python_single_target_python2_7 -python_targets_python3_6 -python_single_target_python3_6 -python_targets_python3_7 -python_single_target_python3_7 python_targets_python3_8 python_single_target_python3_8 -python_targets_python3_10 -python_single_target_python3_10 +python_targets_python3_9 +python_single_target_python3_9 +python_targets_python3_11 +python_single_target_python3_11 # Unmask selinux so it can be enabled selectively in package.use -selinux