Merge branch 'dev' into 3.8

Author: freakboy3742

.github/workflows/release.yaml

@@ -44,7 +44,7 @@ jobs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
 
   build:
-    runs-on: macOS-latest
+    runs-on: macOS-11.0
     needs: make-release
     strategy:
       max-parallel: 4

Makefile

@@ -48,7 +48,7 @@ BZIP2_VERSION=1.0.8
 
 XZ_VERSION=5.2.5
 
-LIBFFI_VERSION=3.3
+LIBFFI_VERSION=3.4.2
 
 # Supported OS
 OS=macOS iOS tvOS watchOS
@@ -492,12 +492,6 @@ $$(LIBFFI_DIR-$1)/darwin_common: downloads/libffi-$(LIBFFI_VERSION).tgz
 	# Unpack sources
 	mkdir -p $$(LIBFFI_DIR-$1)
 	tar zxf downloads/libffi-$(LIBFFI_VERSION).tgz --strip-components 1 -C $$(LIBFFI_DIR-$1)
-	# Apply libffi patches. Apple builds of libffi use a utility script; that
-	# script doesn't work with Python3 using the out-of-the-box version in
-	# libffi 3.3. This patch adds some changes that will be included in libFFI
-	# 3.4 (whenever that is released), plus some extra targets to support
-	# tvOS and watchOS.
-	cd $$(LIBFFI_DIR-$1) && patch -p1 < $(PROJECT_DIR)/patch/libffi/libffi.patch
 	# Configure the build
 	cd $$(LIBFFI_DIR-$1) && python generate-darwin-source-and-headers.py --only-$(shell echo $1 | tr '[:upper:]' '[:lower:]')
 

README.rst

@@ -1,7 +1,7 @@
 Python Apple Support
 ====================
 
-**This repository branch builds a packaged version of Python 3.8.9**.
+**This repository branch builds a packaged version of Python 3.8.11**.
 Other Python versions are available by cloning other branches of the main
 repository.
 
@@ -12,11 +12,11 @@ It works by downloading, patching, and building a fat binary of Python and
 selected pre-requisites, and packaging them as static libraries that can be
 incorporated into an XCode project.
 
-The binaries support x86_64 for macOS; arm64 for iOS and appleTV devices;
-and armv7k for watchOS. This should enable the code to run on:
+The binaries support x86_64 and arm64 for macOS; arm64 for iOS and appleTV
+devices; and armv7k for watchOS. This should enable the code to run on:
 
-* MacBook
-* iMac
+* MacBook (including MacBooks using Apple Silicon)
+* iMac (including iMacs using Apple Silicon)
 * Mac Pro
 * iPhone (5s or later)
 * iPad (5th gen or later)
@@ -71,7 +71,7 @@ to build a specific package; or, to build all supported packages::
 For details on how to add these binary packages to your project, see the
 package-specific documentation linked above.
 
-.. _for macOS: https://briefcase-support.org/python?platform=macOS&version=3.9
-.. _for iOS: https://briefcase-support.org/python?platform=iOS&version=3.9
-.. _for tvOS: https://briefcase-support.org/python?platform=tvOS&version=3.9
-.. _for watchOS: https://briefcase-support.org/python?platform=watchOS&version=3.9
+.. _for macOS: https://briefcase-support.org/python?platform=macOS&version=3.8
+.. _for iOS: https://briefcase-support.org/python?platform=iOS&version=3.8
+.. _for tvOS: https://briefcase-support.org/python?platform=tvOS&version=3.8
+.. _for watchOS: https://briefcase-support.org/python?platform=watchOS&version=3.8

patch/Python/release.common.exclude

@@ -18,13 +18,7 @@ Python/Resources/lib/python*/lib2to3/tests
 Python/Resources/lib/python*/sqlite3/test
 Python/Resources/lib/python*/test
 # Remove compiled test and example modules.
-Python/Resources/lib/python*/lib-dynload/_test*.so
-Python/Resources/lib/python*/lib-dynload/_ctypes_test*.so
-Python/Resources/lib/python*/lib-dynload/xxlimited*.so
-Python/Resources/lib/python*/lib-dynload/_xx*.so
-# Remove wsgiref web app module; it's unusual that mobile apps would
-# start a web app server with it.
-Python/Resources/lib/python*/wsgiref
+Python/Resources/lib/python*/lib-dynload/*.so
 # Remove config-* directory, which is used for compiling C extension modules.
 Python/Resources/lib/python*/config-*
 # Remove ensurepip. If user code needs pip, it can add it to

patch/Python/release.iOS.exclude

@@ -4,4 +4,3 @@
 #
 # Remove command-line curses toolkit.
 Python/Resources/lib/python*/curses
-Python/Resources/lib/python*/lib-dynload/_curses*.so

patch/Python/release.tvOS.exclude

@@ -4,4 +4,3 @@
 #
 # Remove command-line curses toolkit.
 Python/Resources/lib/python*/curses
-Python/Resources/lib/python*/lib-dynload/_curses*.so

patch/Python/release.watchOS.exclude

@@ -4,4 +4,3 @@
 #
 # Remove command-line curses toolkit.
 Python/Resources/lib/python*/curses
-Python/Resources/lib/python*/lib-dynload/_curses*.so