Support for Python 3.13.

Co-authored-by: Zanie Blue <contact@zanie.dev>
indygreg · Sep 6, 2024 · 0b230ff · 0b230ff
1 parent 953883a
commit 0b230ff
Show file tree

Hide file tree

Showing 20 changed files with 587 additions and 32 deletions.
diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml
@@ -114,6 +114,19 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'pgo+lto'
 
+          - target_triple: 'aarch64-apple-darwin'
+            runner: macos-14
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'aarch64-apple-darwin'
+            runner: macos-14
+            py: 'cpython-3.13'
+            optimizations: 'pgo'
+          - target_triple: 'aarch64-apple-darwin'
+            runner: macos-14
+            py: 'cpython-3.13'
+            optimizations: 'pgo+lto'
+
           # macOS on Intel hardware. This is pretty straightforward. We exclude
           # noopt because it doesn't provide any compelling advantages over PGO
           # or LTO builds.
@@ -181,6 +194,19 @@ jobs:
             runner: macos-13
             py: 'cpython-3.12'
             optimizations: 'pgo+lto'
+
+          - target_triple: 'x86_64-apple-darwin'
+            runner: macos-13
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'x86_64-apple-darwin'
+            runner: macos-13
+            py: 'cpython-3.13'
+            optimizations: 'pgo'
+          - target_triple: 'x86_64-apple-darwin'
+            runner: macos-13
+            py: 'cpython-3.13'
+            optimizations: 'pgo+lto'
     needs:
       - pythonbuild
     runs-on: ${{ matrix.build.runner }}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -175,6 +175,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'aarch64-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'aarch64-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'aarch64-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # Cross-compiles can't do PGO and require Python 3.9.
           - target_triple: 'armv7-unknown-linux-gnueabi'
             py: 'cpython-3.9'
@@ -216,6 +226,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'armv7-unknown-linux-gnueabi'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'armv7-unknown-linux-gnueabi'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'armv7-unknown-linux-gnueabi'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # Cross-compiles can't do PGO and require Python 3.9.
           - target_triple: 'armv7-unknown-linux-gnueabihf'
             py: 'cpython-3.9'
@@ -257,6 +277,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'armv7-unknown-linux-gnueabihf'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'armv7-unknown-linux-gnueabihf'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'armv7-unknown-linux-gnueabihf'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # Cross-compiles can't do PGO and require Python 3.9.
           - target_triple: 'mips-unknown-linux-gnu'
             py: 'cpython-3.9'
@@ -298,6 +328,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'mips-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'mips-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'mips-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # Cross-compiles can't do PGO and require Python 3.9.
           - target_triple: 'mipsel-unknown-linux-gnu'
             py: 'cpython-3.9'
@@ -339,6 +379,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'mipsel-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'mipsel-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'mipsel-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # Cross-compiles can't do PGO and require Python 3.9.
           - target_triple: 's390x-unknown-linux-gnu'
             py: 'cpython-3.9'
@@ -380,6 +430,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 's390x-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 's390x-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 's390x-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # Cross-compiles can't do PGO and require Python 3.9.
           - target_triple: 'ppc64le-unknown-linux-gnu'
             py: 'cpython-3.9'
@@ -421,6 +481,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'ppc64le-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'ppc64le-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'ppc64le-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # We don't publish noopt builds when PGO is available.
           - target_triple: 'x86_64-unknown-linux-gnu'
             py: 'cpython-3.8'
@@ -487,6 +557,19 @@ jobs:
             optimizations: 'pgo+lto'
             run: true
 
+          - target_triple: 'x86_64-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+            run: true
+          - target_triple: 'x86_64-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'pgo'
+            run: true
+          - target_triple: 'x86_64-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'pgo+lto'
+            run: true
+
           - target_triple: 'x86_64_v2-unknown-linux-gnu'
             py: 'cpython-3.9'
             optimizations: 'debug'
@@ -539,6 +622,19 @@ jobs:
             optimizations: 'pgo+lto'
             run: true
 
+          - target_triple: 'x86_64_v2-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+            run: true
+          - target_triple: 'x86_64_v2-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'pgo'
+            run: true
+          - target_triple: 'x86_64_v2-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'pgo+lto'
+            run: true
+
           - target_triple: 'x86_64_v3-unknown-linux-gnu'
             py: 'cpython-3.9'
             optimizations: 'debug'
@@ -591,6 +687,19 @@ jobs:
             optimizations: 'pgo+lto'
             run: true
 
+          - target_triple: 'x86_64_v3-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+            run: true
+          - target_triple: 'x86_64_v3-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'pgo'
+            run: true
+          - target_triple: 'x86_64_v3-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'pgo+lto'
+            run: true
+
           # GitHub Actions runners don't support x86-64-v4 so we can't PGO.
           - target_triple: 'x86_64_v4-unknown-linux-gnu'
             py: 'cpython-3.9'
@@ -633,6 +742,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'x86_64_v4-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'x86_64_v4-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'x86_64_v4-unknown-linux-gnu'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
           # musl doesn't support PGO.
           - target_triple: 'x86_64-unknown-linux-musl'
             py: 'cpython-3.8'
@@ -699,6 +818,19 @@ jobs:
             optimizations: 'lto'
             run: true
 
+          - target_triple: 'x86_64-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+            run: true
+          - target_triple: 'x86_64-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+            run: true
+          - target_triple: 'x86_64-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+            run: true
+
           - target_triple: 'x86_64_v2-unknown-linux-musl'
             py: 'cpython-3.9'
             optimizations: 'debug'
@@ -751,6 +883,19 @@ jobs:
             optimizations: 'lto'
             run: true
 
+          - target_triple: 'x86_64_v2-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+            run: true
+          - target_triple: 'x86_64_v2-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+            run: true
+          - target_triple: 'x86_64_v2-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+            run: true
+
           - target_triple: 'x86_64_v3-unknown-linux-musl'
             py: 'cpython-3.9'
             optimizations: 'debug'
@@ -803,6 +948,19 @@ jobs:
             optimizations: 'lto'
             run: true
 
+          - target_triple: 'x86_64_v3-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+            run: true
+          - target_triple: 'x86_64_v3-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+            run: true
+          - target_triple: 'x86_64_v3-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+            run: true
+
           - target_triple: 'x86_64_v4-unknown-linux-musl'
             py: 'cpython-3.9'
             optimizations: 'debug'
@@ -843,6 +1001,16 @@ jobs:
             py: 'cpython-3.12'
             optimizations: 'lto'
 
+          - target_triple: 'x86_64_v4-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'debug'
+          - target_triple: 'x86_64_v4-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'noopt'
+          - target_triple: 'x86_64_v4-unknown-linux-musl'
+            py: 'cpython-3.13'
+            optimizations: 'lto'
+
     needs:
       - pythonbuild
       - image

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -54,6 +54,7 @@ jobs:
           - 'cpython-3.10'
           - 'cpython-3.11'
           - 'cpython-3.12'
+          - 'cpython-3.13'
         vcvars:
           - 'vcvars32.bat'
           - 'vcvars64.bat'

diff --git a/cpython-unix/Makefile b/cpython-unix/Makefile
@@ -270,6 +270,8 @@ $(OUTDIR)/cpython-3.11-$(CPYTHON_3.11_VERSION)-$(HOST_PLATFORM).tar: $(PYTHON_HO
 $(OUTDIR)/cpython-3.12-$(CPYTHON_3.12_VERSION)-$(HOST_PLATFORM).tar: $(PYTHON_HOST_DEPENDS)
 	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.12-host
 
+$(OUTDIR)/cpython-3.13-$(CPYTHON_3.13_VERSION)-$(HOST_PLATFORM).tar: $(PYTHON_HOST_DEPENDS)
+	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.13-host
 
 PYTHON_DEPENDS := \
     $(PYTHON_SUPPORT_FILES) \
@@ -318,3 +320,6 @@ $(OUTDIR)/cpython-$(CPYTHON_3.11_VERSION)-$(PACKAGE_SUFFIX).tar: $(ALL_PYTHON_DE
 
 $(OUTDIR)/cpython-$(CPYTHON_3.12_VERSION)-$(PACKAGE_SUFFIX).tar: $(ALL_PYTHON_DEPENDS)
 	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.12
+
+$(OUTDIR)/cpython-$(CPYTHON_3.13_VERSION)-$(PACKAGE_SUFFIX).tar: $(ALL_PYTHON_DEPENDS)
+	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) cpython-3.13
diff --git a/cpython-unix/build-cpython-host.sh b/cpython-unix/build-cpython-host.sh
@@ -38,11 +38,18 @@ pushd "Python-${PYTHON_VERSION}"
 # configure. This is reported as https://bugs.python.org/issue45405. We nerf the
 # check since we know what we're doing.
 if [ "${CC}" = "clang" ]; then
-  if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
+  if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
+    patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
+  elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
     patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
   else
     patch -p1 -i ${ROOT}/patch-disable-multiarch-legacy.patch
   fi
+elif [ "${CC}" = "musl-clang" ]; then
+  # Similarly, this is a problem for musl Clang on Python 3.13+
+  if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
+    patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
+  fi
 fi
 
 autoconf