Merge pull request #3618 from flatcar/krnowak/python-bump

Bump python to 3.12

Author: krnowak

build_library/catalyst.sh

@@ -80,7 +80,8 @@ export ac_cv_posix_semaphores_enabled=yes
 EOF
 }
 
-# Common values for all stage spec files
+# Common values for all stage spec files. Takes a stage number and,
+# optionally, a profile name as parameters.
 catalyst_stage_default() {
 cat <<EOF
 target: stage$1
@@ -89,7 +90,7 @@ rel_type: $TYPE
 portage_confdir: $TEMPDIR/portage
 repos: $FLAGS_coreos_overlay
 keep_repos: portage-stable coreos-overlay
-profile: $FLAGS_profile
+profile: ${2:-$FLAGS_profile}
 snapshot_treeish: $FLAGS_version
 version_stamp: $FLAGS_version
 cflags: -O2 -pipe
@@ -107,7 +108,7 @@ pkgcache_path: ${TEMPDIR}/stage1-${ARCH}-packages
 update_seed: yes
 update_seed_command: --exclude cross-*-cros-linux-gnu/* --exclude dev-lang/rust --exclude dev-lang/rust-bin --ignore-world y --ignore-built-slot-operator-deps y @changed-subslot
 EOF
-catalyst_stage_default 1
+catalyst_stage_default 1 "${FLAGS_profile}/transition"
 }
 
 catalyst_stage3() {

changelog/updates/2026-01-07-python-bump.md

@@ -0,0 +1 @@
+- python ([3.12.12](https://www.python.org/downloads/release/python-31212/) (includes [3.12.0](https://www.python.org/downloads/release/python-3120/)))

…google-compute-engine-20190124-r2.ebuild …google-compute-engine-20190124-r3.ebuildsdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r2.ebuild renamed to sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r3.ebuild sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r2.ebuild renamed to sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20190124-r3.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{11..14} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1

…ation/xenstore/xenstore-4.14.2-r2.ebuild …ation/xenstore/xenstore-4.14.2-r3.ebuildsdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild renamed to sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r3.ebuild sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild renamed to sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r3.ebuild

@@ -4,7 +4,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..11} )
+PYTHON_COMPAT=( python3_{11..14} )
 
 inherit multilib python-any-r1 systemd toolchain-funcs
 

…ertificates/ca-certificates-3.120.ebuild …ificates/ca-certificates-3.120-r1.ebuildsdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.120.ebuild renamed to sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.120-r1.ebuild sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.120.ebuild renamed to sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.120-r1.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..11} )
+PYTHON_COMPAT=( python3_{11..14} )
 TMPFILES_OPTIONAL=1
 inherit python-any-r1 systemd tmpfiles
 

…oreos-init/coreos-init-0.0.1-r201.ebuild …oreos-init/coreos-init-0.0.1-r202.ebuildsdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r201.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r202.ebuild sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r201.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r202.ebuild

@@ -4,7 +4,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit systemd python-any-r1
 
 DESCRIPTION="Init scripts for Flatcar"

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{6..11} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit python-single-r1
 
 DESCRIPTION="emerge utilities for Flatcar developer images"

…tclone/emerge-gitclone-0.0.1-r592.ebuild …tclone/emerge-gitclone-0.0.1-r593.ebuildsdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r592.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r593.ebuild sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r592.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r593.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{11..14} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 pypi
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-unbundle-six.patch
 	"${FILESDIR}"/${P}-py310.patch
 	"${FILESDIR}"/${P}-mock-spec.patch
+	"${FILESDIR}"/${P}-py312.patch
 )
 
 RDEPEND="