From f552363a5e32b0c27c6358c5d9222cadb565d5b2 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 10 Aug 2025 22:24:37 +0100 Subject: [PATCH 1/2] Require Python 3.11 to Python 3.15 for PYTHON_FOR_REGEN --- .ruff.toml | 2 +- Tools/build/.ruff.toml | 4 ---- configure | 2 +- configure.ac | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.ruff.toml b/.ruff.toml index 1c015fa88415bc..77759076b2bae7 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -1,7 +1,7 @@ # Default settings for Ruff in CPython # PYTHON_FOR_REGEN -target-version = "py310" +target-version = "py311" # PEP 8 line-length = 79 diff --git a/Tools/build/.ruff.toml b/Tools/build/.ruff.toml index dcbf2936290f12..eafa51127a08f0 100644 --- a/Tools/build/.ruff.toml +++ b/Tools/build/.ruff.toml @@ -1,9 +1,5 @@ extend = "../../.ruff.toml" # Inherit the project-wide settings -[per-file-target-version] -"deepfreeze.py" = "py311" # requires `code.co_exceptiontable` -"stable_abi.py" = "py311" # requires 'tomllib' - [format] preview = true docstring-code-format = true diff --git a/configure b/configure index 451f72fdfd4ec3..96a605b1980d6a 100755 --- a/configure +++ b/configure @@ -3816,7 +3816,7 @@ fi -for ac_prog in python$PACKAGE_VERSION python3.13 python3.12 python3.11 python3.10 python3 python +for ac_prog in python$PACKAGE_VERSION python3.15 python3.14 python3.13 python3.12 python3.11 python3 python do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 diff --git a/configure.ac b/configure.ac index f0e9eb2ee88c03..bb7fce6f4bf587 100644 --- a/configure.ac +++ b/configure.ac @@ -205,7 +205,7 @@ AC_SUBST([FREEZE_MODULE_DEPS]) AC_SUBST([PYTHON_FOR_BUILD_DEPS]) AC_CHECK_PROGS([PYTHON_FOR_REGEN], - [python$PACKAGE_VERSION python3.13 python3.12 python3.11 python3.10 python3 python], + [python$PACKAGE_VERSION python3.15 python3.14 python3.13 python3.12 python3.11 python3 python], [python3]) AC_SUBST([PYTHON_FOR_REGEN]) From 3f8ca7705146b91e93aa94aa7ddc6beb04f531ea Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 10 Aug 2025 22:28:37 +0100 Subject: [PATCH 2/2] NEWS --- .../next/Build/2025-08-10-22-28-06.gh-issue-137618.FdNvIE.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2025-08-10-22-28-06.gh-issue-137618.FdNvIE.rst diff --git a/Misc/NEWS.d/next/Build/2025-08-10-22-28-06.gh-issue-137618.FdNvIE.rst b/Misc/NEWS.d/next/Build/2025-08-10-22-28-06.gh-issue-137618.FdNvIE.rst new file mode 100644 index 00000000000000..9f3002c378d559 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-08-10-22-28-06.gh-issue-137618.FdNvIE.rst @@ -0,0 +1,2 @@ +``PYTHON_FOR_REGEN`` now requires Python 3.11 to Python 3.15. +Patch by Adam Turner.