Skip to content

Commit 9e78e14

Browse files
authored
Update patch to 3.13.8. (#323)
1 parent e763bb8 commit 9e78e14

File tree

2 files changed

+26
-34
lines changed

2 files changed

+26
-34
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ BUILD_NUMBER=custom
1919
# of a release cycle, as official binaries won't be published.
2020
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
2121
# PYTHON_VER is the major/minor version (e.g., 3.10)
22-
PYTHON_VERSION=3.13.7
22+
PYTHON_VERSION=3.13.8
2323
PYTHON_PKG_VERSION=$(PYTHON_VERSION)
2424
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
2525
PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")

patch/Python/Python.patch

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5783,7 +5783,7 @@
57835783
+#include "pyconfig-x86_64.h"
57845784
+#endif
57855785
diff --git a/Doc/using/ios.rst b/Doc/using/ios.rst
5786-
index 685d8e81add..4ed18f4938c 100644
5786+
index 9921fd6114b..4ed18f4938c 100644
57875787
--- a/Doc/using/ios.rst
57885788
+++ b/Doc/using/ios.rst
57895789
@@ -170,7 +170,7 @@
@@ -5850,23 +5850,23 @@ index 685d8e81add..4ed18f4938c 100644
58505850
- echo "Installing Python modules for iOS Device"
58515851
- rsync -au --delete "$PROJECT_DIR/Python.xcframework/ios-arm64/lib/" "$CODESIGNING_FOLDER_PATH/python/lib/"
58525852
- fi
5853-
-
5853+
+ set -e
5854+
+ source $PROJECT_DIR/Python.xcframework/build/build_utils.sh
5855+
+ install_python Python.xcframework app
5856+
58545857
- Note that the name of the simulator "slice" in the XCframework may be
58555858
- different, depending the CPU architectures your ``XCFramework`` supports.
5856-
-
5859+
+ If you have placed your XCframework somewhere other than the root of your
5860+
+ project, modify the path to the first argument.
5861+
58575862
-9. Add a second build step that processes the binary extension modules in the
58585863
- standard library into "Framework" format. Add a "Run Script" build step
58595864
- *directly after* the one you added in step 8, named "Prepare Python Binary
58605865
- Modules". It should also have "Based on dependency analysis" unchecked, with
58615866
- the following script content:
5862-
+ set -e
5863-
+ source $PROJECT_DIR/Python.xcframework/build/build_utils.sh
5864-
+ install_python Python.xcframework app
5865-
5867+
-
58665868
- .. code-block:: bash
5867-
+ If you have placed your XCframework somewhere other than the root of your
5868-
+ project, modify the path to the first argument.
5869-
5869+
-
58705870
- set -e
58715871
-
58725872
- install_dylib () {
@@ -5996,24 +5996,16 @@ index 685d8e81add..4ed18f4938c 100644
59965996

59975997
You can then use the ``app-testbed`` folder to run the test suite for your app,
59985998
For example, if ``module1.tests`` was the entry point to your test suite, you
5999-
@@ -372,13 +309,29 @@
5999+
@@ -379,7 +316,7 @@
6000+
arguments.
60006001

6001-
This will allow you to use the full Xcode suite of tools for debugging.
6002-
6003-
+The arguments used to run the test suite are defined as part of the test plan.
6004-
+To modify the test plan, select the test plan node of the project tree (it
6005-
+should be the first child of the root node), and select the "Configurations"
6006-
+tab. Modify the "Arguments Passed On Launch" value to change the testing
6007-
+arguments.
6008-
+
6009-
+The test plan also disables parallel testing, and specifies the use of the
6002+
The test plan also disables parallel testing, and specifies the use of the
6003+
-``iOSTestbed.lldbinit`` file for providing configuration of the debugger. The
60106004
+``Testbed.lldbinit`` file for providing configuration of the debugger. The
6011-
+default debugger configuration disables automatic breakpoints on the
6012-
+``SIGINT``, ``SIGUSR1``, ``SIGUSR2``, and ``SIGXFSZ`` signals.
6013-
+
6014-
App Store Compliance
6015-
====================
6005+
default debugger configuration disables automatic breakpoints on the
6006+
``SIGINT``, ``SIGUSR1``, ``SIGUSR2``, and ``SIGXFSZ`` signals.
60166007

6008+
@@ -389,7 +326,12 @@
60176009
The only mechanism for distributing apps to third-party iOS devices is to
60186010
submit the app to the iOS App Store; apps submitted for distribution must pass
60196011
Apple's app review process. This process includes a set of automated validation
@@ -6027,7 +6019,7 @@ index 685d8e81add..4ed18f4938c 100644
60276019

60286020
The Python standard library contains some code that is known to violate these
60296021
automated rules. While these violations appear to be false positives, Apple's
6030-
@@ -389,3 +342,18 @@
6022+
@@ -400,3 +342,18 @@
60316023
:source:`a patch file <Mac/Resources/app-store-compliance.patch>` that will remove
60326024
all code that is known to cause issues with the App Store review process. This
60336025
patch is applied automatically when building for iOS.
@@ -6077,7 +6069,7 @@ index 117bf06cb01..87611a6d03f 100644
60776069
def find_library(name):
60786070
possible = ['lib%s.dylib' % name,
60796071
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
6080-
index eb8fea1aad0..9e1d8bf2995 100644
6072+
index c5e641773e6..4260ab6a74a 100644
60816073
--- a/Lib/importlib/_bootstrap_external.py
60826074
+++ b/Lib/importlib/_bootstrap_external.py
60836075
@@ -52,7 +52,7 @@
@@ -6089,7 +6081,7 @@ index eb8fea1aad0..9e1d8bf2995 100644
60896081
_CASE_INSENSITIVE_PLATFORMS = (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY
60906082
+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY)
60916083

6092-
@@ -1799,7 +1799,7 @@
6084+
@@ -1800,7 +1800,7 @@
60936085
"""
60946086
extension_loaders = []
60956087
if hasattr(_imp, 'create_dynamic'):
@@ -6283,7 +6275,7 @@ index ffc3fdf6afb..7df38b4f3d8 100644
62836275
if _mswindows:
62846276
import _winapi
62856277
diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
6286-
index 510c7b9568a..91ecd8a28d8 100644
6278+
index f7bd675bb3b..98ee0cf234c 100644
62876279
--- a/Lib/sysconfig/__init__.py
62886280
+++ b/Lib/sysconfig/__init__.py
62896281
@@ -23,6 +23,9 @@
@@ -6305,7 +6297,7 @@ index 510c7b9568a..91ecd8a28d8 100644
63056297
return None
63066298

63076299
def joinuser(*args):
6308-
@@ -676,6 +679,18 @@
6300+
@@ -680,6 +683,18 @@
63096301
release = get_config_vars().get("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
63106302
osname = sys.platform
63116303
machine = sys.implementation._multiarch
@@ -6341,10 +6333,10 @@ index 44c5b28f455..0b4f874ec15 100644
63416333
else:
63426334
extension_loader = "ExtensionFileLoader"
63436335
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
6344-
index c60fc03064f..0b71e6d9511 100644
6336+
index 4605938b875..5f1223e57d6 100644
63456337
--- a/Lib/test/support/__init__.py
63466338
+++ b/Lib/test/support/__init__.py
6347-
@@ -554,7 +554,7 @@
6339+
@@ -582,7 +582,7 @@
63486340

63496341
is_android = sys.platform == "android"
63506342

@@ -6353,7 +6345,7 @@ index c60fc03064f..0b71e6d9511 100644
63536345
unix_shell = '/system/bin/sh' if is_android else '/bin/sh'
63546346
else:
63556347
unix_shell = None
6356-
@@ -564,7 +564,7 @@
6348+
@@ -592,7 +592,7 @@
63576349
is_emscripten = sys.platform == "emscripten"
63586350
is_wasi = sys.platform == "wasi"
63596351

0 commit comments

Comments
 (0)