Merge branch 'main' into 3.9

.github/workflows/ci.yaml

@@ -103,7 +103,7 @@ jobs:
     - uses: actions/[email protected]
 
     - name: Set up Python
-      uses: actions/setup-python@v5.2.0
+      uses: actions/setup-python@v5.3.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.

.github/workflows/publish.yaml

@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python environment
-      uses: actions/setup-python@v5.2.0
+      uses: actions/setup-python@v5.3.0
       with:
         python-version: "3.X"
 

Makefile

@@ -18,7 +18,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.9.20
+PYTHON_VERSION=3.9.21
 PYTHON_PKG_VERSION=3.9.13
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -289,6 +289,9 @@ $$(PYTHON_LIB-$(target)): $$(PYTHON_SRCDIR-$(target))/python.exe
 			make install \
 				2>&1 | tee -a ../python-$(PYTHON_VERSION).install.log
 
+		# Remove any .orig files produced by the compliance patching process
+		find $$(PYTHON_INSTALL-$(target)) -name "*.orig" -exec rm {} \;
+
 endif
 
 PYTHON_SITECUSTOMIZE-$(target)=$(PROJECT_DIR)/support/$(PYTHON_VER)/$(os)/platform-site/$(target)/sitecustomize.py
@@ -520,6 +523,9 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	# Apply the App Store compliance patch
 	# patch --strip 2 --directory $$(PYTHON_INSTALL_VERSION-macosx)/lib/python$(PYTHON_VER) --input $(PROJECT_DIR)/patch/Python/app-store-compliance.patch
 
+	# Remove any .orig files produced by the patching process
+	find $$(PYTHON_INSTALL_VERSION-macosx) -name "*.orig" -exec rm {} \;
+
 	# Rewrite the framework to make it standalone
 	patch/make-relocatable.sh $$(PYTHON_INSTALL_VERSION-macosx) 2>&1 > /dev/null
 
@@ -573,6 +579,11 @@ $$(PYTHON_XCFRAMEWORK-$(os))/Info.plist: \
 	@echo ">>> Create helper links in XCframework for $(os)"
 	$$(foreach sdk,$$(SDKS-$(os)),ln -si $$(SDK_SLICE-$$(sdk)) $$(PYTHON_XCFRAMEWORK-$(os))/$$(sdk); )
 
+ifeq ($(os),iOS)
+	@echo ">>> Clone testbed project for $(os)"
+	$(HOST_PYTHON) $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$$(firstword $$(SDKS-$(os))))))/iOS/testbed clone --framework $$(PYTHON_XCFRAMEWORK-$(os)) support/$(PYTHON_VER)/$(os)/testbed
+endif
+
 	@echo ">>> Create VERSIONS file for $(os)"
 	echo "Python version: $(PYTHON_VERSION) " > support/$(PYTHON_VER)/$(os)/VERSIONS
 	echo "Build: $(BUILD_NUMBER)" >> support/$(PYTHON_VER)/$(os)/VERSIONS

README.rst

@@ -12,6 +12,7 @@ repository:
 * `Python 3.11 <https://github.com/beeware/Python-Apple-support/tree/3.11>`__
 * `Python 3.12 <https://github.com/beeware/Python-Apple-support/tree/3.12>`__
 * `Python 3.13 <https://github.com/beeware/Python-Apple-support/tree/3.13>`__
+* `Python 3.14 <https://github.com/beeware/Python-Apple-support/tree/3.14>`__
 
 It works by downloading, patching, and building a fat binary of Python and
 selected pre-requisites, and packaging them as frameworks that can be