From 89c90687bc66933108cfe1cc36ec210ff3d113c3 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Tue, 11 Feb 2025 13:03:40 -0600 Subject: [PATCH 1/3] Bump to CPython 3.14.0a5 --- pythonbuild/downloads.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py index 0a723aa9..299b8c74 100644 --- a/pythonbuild/downloads.py +++ b/pythonbuild/downloads.py @@ -80,10 +80,10 @@ "python_tag": "cp313", }, "cpython-3.14": { - "url": "https://www.python.org/ftp/python/3.14.0/Python-3.14.0a4.tar.xz", - "size": 22798932, - "sha256": "c24f07881873c1d460228795ca6ca8c99130e30c773c91463d30d7ea8ff0e70b", - "version": "3.14.0a4", + "url": "https://www.python.org/ftp/python/3.14.0/Python-3.14.0a5.tar.xz", + "size": 22850560, + "sha256": "e42d91d6dd3016bfc2f6f96c1129b40ca6d8f6e1bf3b30a11de146d930f43b32", + "version": "3.14.0a5", "licenses": ["Python-2.0", "CNRI-Python"], "license_file": "LICENSE.cpython.txt", "python_tag": "cp314", From 82c07fde1c84f93f1d3352d81a5be5f434ab50f6 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Tue, 11 Feb 2025 16:59:00 -0600 Subject: [PATCH 2/3] Remove upstreamed `patch-test-embed-prevent-segfault-3.14.patch` --- cpython-unix/build-cpython.sh | 5 --- ...tch-test-embed-prevent-segfault-3.14.patch | 36 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 cpython-unix/patch-test-embed-prevent-segfault-3.14.patch diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh index 6d8a5cde..afef8b0d 100755 --- a/cpython-unix/build-cpython.sh +++ b/cpython-unix/build-cpython.sh @@ -314,11 +314,6 @@ if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_12}" ]; then patch -p1 -i ${ROOT}/patch-test-embed-prevent-segfault.patch fi -# Same as above but for an additional set of tests introduced in 3.14. -if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" ]; then - patch -p1 -i ${ROOT}/patch-test-embed-prevent-segfault-3.14.patch -fi - # Most bits look at CFLAGS. But setup.py only looks at CPPFLAGS. # So we need to set both. CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC -I${TOOLS_PATH}/deps/include -I${TOOLS_PATH}/deps/include/ncursesw" diff --git a/cpython-unix/patch-test-embed-prevent-segfault-3.14.patch b/cpython-unix/patch-test-embed-prevent-segfault-3.14.patch deleted file mode 100644 index d5144086..00000000 --- a/cpython-unix/patch-test-embed-prevent-segfault-3.14.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py -index 7110fb889f3..1b55cd156d7 100644 ---- a/Lib/test/test_embed.py -+++ b/Lib/test/test_embed.py -@@ -940,6 +940,7 @@ def check_all_configs(self, testname, expected_config=None, - self.check_global_config(configs) - return configs - -+ @unittest.skipIf(support.check_bolt_optimized, "segfaults on BOLT instrumented binaries") - def test_init_default_config(self): - self.check_all_configs("test_init_initialize_config", api=API_COMPAT) - -@@ -1039,6 +1040,7 @@ def test_init_from_config(self): - self.check_all_configs("test_init_from_config", config, preconfig, - api=API_COMPAT) - -+ @unittest.skipIf(support.check_bolt_optimized, "segfaults on BOLT instrumented binaries") - def test_init_compat_env(self): - preconfig = { - 'allocator': ALLOCATOR_FOR_CONFIG, -@@ -1074,6 +1076,7 @@ def test_init_compat_env(self): - self.check_all_configs("test_init_compat_env", config, preconfig, - api=API_COMPAT) - -+ @unittest.skipIf(support.check_bolt_optimized, "segfaults on BOLT instrumented binaries") - def test_init_python_env(self): - preconfig = { - 'allocator': ALLOCATOR_FOR_CONFIG, -@@ -1772,6 +1775,7 @@ def test_init_set_config(self): - self.check_all_configs("test_init_set_config", config, - api=API_ISOLATED) - -+ @unittest.skipIf(support.check_bolt_optimized, "segfaults on BOLT instrumented binaries") - def test_initconfig_api(self): - preconfig = { - 'configure_locale': True, From e39257ae2e9cdb0c48b3145f968b405f7092b576 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Wed, 12 Feb 2025 07:23:50 -0600 Subject: [PATCH 3/3] Update to 74e83f26de1e4fb9eef1b56492cff92508834bb71ac13f5c580438ce9f093682 with Windows PGO fix --- pythonbuild/downloads.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py index 299b8c74..cfea4745 100644 --- a/pythonbuild/downloads.py +++ b/pythonbuild/downloads.py @@ -81,8 +81,8 @@ }, "cpython-3.14": { "url": "https://www.python.org/ftp/python/3.14.0/Python-3.14.0a5.tar.xz", - "size": 22850560, - "sha256": "e42d91d6dd3016bfc2f6f96c1129b40ca6d8f6e1bf3b30a11de146d930f43b32", + "size": 22859900, + "sha256": "74e83f26de1e4fb9eef1b56492cff92508834bb71ac13f5c580438ce9f093682", "version": "3.14.0a5", "licenses": ["Python-2.0", "CNRI-Python"], "license_file": "LICENSE.cpython.txt",