From 927361402d595ce42dd5521bc352661ea3e7a7d7 Mon Sep 17 00:00:00 2001 From: "Anthony Sottile (deadsnakes)" Date: Thu, 30 Jan 2025 08:52:59 +0000 Subject: [PATCH] update to 71aecc284efdf997939568a4167dbffe1a65b9bf (nightly) --- changelogs/nightly/jammy | 6 ++++++ changelogs/nightly/noble | 6 ++++++ cpython | 2 +- patches/distutils-install-layout.diff | 10 +++++----- patches/multiarch.diff | 4 ++-- patches/sysconfigdata-name.patch | 6 +++--- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/changelogs/nightly/jammy b/changelogs/nightly/jammy index c25d47b..b2a83de 100644 --- a/changelogs/nightly/jammy +++ b/changelogs/nightly/jammy @@ -1,3 +1,9 @@ +python3.14 (3.14.0~a4-259-g71aecc284e-1+jammy1) jammy; urgency=medium + + * Update to v3.14.0a4-259-g71aecc284e. + + -- Anthony Sottile (deadsnakes) Thu, 30 Jan 2025 08:52:59 +0000 + python3.14 (3.14.0~a4-238-g41ad2bb248-1+jammy1) jammy; urgency=medium * Update to v3.14.0a4-238-g41ad2bb248. diff --git a/changelogs/nightly/noble b/changelogs/nightly/noble index a664363..3482f9c 100644 --- a/changelogs/nightly/noble +++ b/changelogs/nightly/noble @@ -1,3 +1,9 @@ +python3.14 (3.14.0~a4-259-g71aecc284e-1+noble1) noble; urgency=medium + + * Update to v3.14.0a4-259-g71aecc284e. + + -- Anthony Sottile (deadsnakes) Thu, 30 Jan 2025 08:52:58 +0000 + python3.14 (3.14.0~a4-238-g41ad2bb248-1+noble1) noble; urgency=medium * Update to v3.14.0a4-238-g41ad2bb248. diff --git a/cpython b/cpython index 41ad2bb..71aecc2 160000 --- a/cpython +++ b/cpython @@ -1 +1 @@ -Subproject commit 41ad2bb2489c4cf9ba4f13401750b3fcdb33937b +Subproject commit 71aecc284efdf997939568a4167dbffe1a65b9bf diff --git a/patches/distutils-install-layout.diff b/patches/distutils-install-layout.diff index 5e125ea..f99d2a7 100644 --- a/patches/distutils-install-layout.diff +++ b/patches/distutils-install-layout.diff @@ -26,7 +26,7 @@ index f6dc141..7bbbca5 100644 object.__name__ not in ('xml.etree', 'test.test_pydoc.pydoc_mod')): if docloc.startswith(("http://", "https://")): diff --git a/Lib/site.py b/Lib/site.py -index 92bd1cc..f4466ef 100644 +index 9da8b67..8d3bf27 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -7,12 +7,18 @@ @@ -75,7 +75,7 @@ index 92bd1cc..f4466ef 100644 sitepackages.append(prefix) sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 3c3c979..1ebfe87 100644 +index 69f7245..9018cff 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -27,8 +27,8 @@ @@ -131,7 +131,7 @@ index 3c3c979..1ebfe87 100644 } # For the OS-native venv scheme, we essentially provide an alias: -@@ -148,8 +172,8 @@ def joinuser(*args): +@@ -150,8 +174,8 @@ def joinuser(*args): 'data': '{userbase}', }, 'posix_user': { @@ -142,7 +142,7 @@ index 3c3c979..1ebfe87 100644 'purelib': '{userbase}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages', 'platlib': '{userbase}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages', 'include': '{userbase}/include/{implementation_lower}{py_version_short}{abi_thread}', -@@ -297,12 +321,26 @@ def _get_preferred_schemes(): +@@ -299,12 +323,26 @@ def _get_preferred_schemes(): 'home': 'posix_home', 'user': 'osx_framework_user', } @@ -213,7 +213,7 @@ index 67acf0f..689bfe1 100644 CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) diff --git a/Modules/getpath.py b/Modules/getpath.py -index be22103..b8916a4 100644 +index 9d531e2..499a741 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -179,9 +179,9 @@ diff --git a/patches/multiarch.diff b/patches/multiarch.diff index 948a61b..971e9c1 100644 --- a/patches/multiarch.diff +++ b/patches/multiarch.diff @@ -8,10 +8,10 @@ Subject: multiarch 2 files changed, 7 insertions(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 1ebfe87..cc63925 100644 +index 9018cff..72c4226 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py -@@ -570,6 +570,12 @@ def _init_config_vars(): +@@ -591,6 +591,12 @@ def _init_config_vars(): # e.g., 't' for free-threaded or '' for default build _CONFIG_VARS['abi_thread'] = 't' if _CONFIG_VARS.get('Py_GIL_DISABLED') else '' diff --git a/patches/sysconfigdata-name.patch b/patches/sysconfigdata-name.patch index 254d6d1..1e154f8 100644 --- a/patches/sysconfigdata-name.patch +++ b/patches/sysconfigdata-name.patch @@ -15,10 +15,10 @@ Forwarded: no 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index cc63925..cfab53f 100644 +index 72c4226..2a7c2f2 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py -@@ -384,7 +384,7 @@ def _get_sysconfigdata_name(): +@@ -398,7 +398,7 @@ def _get_sysconfigdata_name(): multiarch = getattr(sys.implementation, '_multiarch', '') return os.environ.get( '_PYTHON_SYSCONFIGDATA_NAME', @@ -26,7 +26,7 @@ index cc63925..cfab53f 100644 + f'_sysconfigdata_{sys.abiflags}_{multiarch}', ) - def _init_posix(vars): + diff --git a/Makefile.pre.in b/Makefile.pre.in index ba4765c..970976d 100644 --- a/Makefile.pre.in