Merge remote-tracking branch 'origin/dev' into inlcude-curses

beeware · Mar 6, 2021 · 8619446 · 8619446
2 parents f1f1790 + b0d860c
commit 8619446
Show file tree

Hide file tree

Showing 19 changed files with 2,464 additions and 31,489 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -69,18 +69,6 @@ jobs:
       env:
         BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
       run: |
-        # 2020-05-29: The iOS 13.4 SDK changed the implementation of FD_SET
-        # to use a weak linked symbol (__darwin_check_fd_set_overflow).
-        # This means any support package built against that SDK is incompatible
-        # with linking against an earlier SDK.
-        # However, you can't get the iOS 13.4 SDK on macOS Mojave (10.14),
-        # because the latest XCode supported on Mojave (11.3.1) only provided
-        # SDK 13.2.
-        # So: We force the use of XCode 11.3.1, which ships with the 13.2 SDK.
-        # For a list of SDKs available on Github Actions, see:
-        # https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md
-        sudo xcode-select --switch /Applications/Xcode_11.3.1.app
-
         # 2020-06-24: The Homebrew copy of gettext leaks into the macOS build
         # if it is present. Uninstall gettext to make sure that doesn't happen.
         # 2021-01-02: Uninstall curl as well. We need curl to download the

diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,6 @@ build/*
 downloads/*
 diff/*
 dist/*
-.env
+.envrc
+.vscode/
+local/*
diff --git a/Makefile b/Makefile
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 Python Apple Support
 ====================
 
-**This repository branch builds a packaged version of Python 3.8.3**.
+**This repository branch builds a packaged version of Python 3.9.1**.
 Other Python versions are available by cloning other branches of the main
 repository.
 
@@ -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.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
+.. _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
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,6 @@ build/* @@
     downloads/*
     diff/*
     dist/*
-    .env
+    .envrc
+    .vscode/
+    local/*