update to e65a1eb93ae35f9fbab1508606e3fbc89123629f (nightly)

deadsnakes · Jan 21, 2025 · 8372e53 · 8372e53
1 parent b8a32f5
commit 8372e53
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/changelogs/nightly/jammy b/changelogs/nightly/jammy
@@ -1,3 +1,9 @@
+python3.14 (3.14.0~a4-106-ge65a1eb93a-1+jammy1) jammy; urgency=medium
+
+  * Update to v3.14.0a4-106-ge65a1eb93a.
+
+ -- Anthony Sottile (deadsnakes) <[email protected]>  Tue, 21 Jan 2025 08:52:40 +0000
+
 python3.14 (3.14.0~a4-68-g4967fa6a9c-1+jammy1) jammy; urgency=medium
 
   * Update to v3.14.0a4-68-g4967fa6a9c.

diff --git a/changelogs/nightly/noble b/changelogs/nightly/noble
@@ -1,3 +1,9 @@
+python3.14 (3.14.0~a4-106-ge65a1eb93a-1+noble1) noble; urgency=medium
+
+  * Update to v3.14.0a4-106-ge65a1eb93a.
+
+ -- Anthony Sottile (deadsnakes) <[email protected]>  Tue, 21 Jan 2025 08:52:40 +0000
+
 python3.14 (3.14.0~a4-68-g4967fa6a9c-1+noble1) noble; urgency=medium
 
   * Update to v3.14.0a4-68-g4967fa6a9c.

diff --git a/cpython b/cpython
diff --git a/patches/distutils-install-layout.diff b/patches/distutils-install-layout.diff
@@ -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 7a4a8f6..e710e7a 100644
+index 3c3c979..1ebfe87 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
 @@ -27,8 +27,8 @@
@@ -142,7 +142,7 @@ index 7a4a8f6..e710e7a 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}',
-@@ -290,12 +314,26 @@ def _get_preferred_schemes():
+@@ -297,12 +321,26 @@ def _get_preferred_schemes():
              'home': 'posix_home',
              'user': 'osx_framework_user',
          }

diff --git 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 e710e7a..0740945 100644
+index 1ebfe87..cc63925 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
-@@ -563,6 +563,12 @@ def _init_config_vars():
+@@ -570,6 +570,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
@@ -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 0740945..b9a12d3 100644
+index cc63925..cfab53f 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
-@@ -377,7 +377,7 @@ def _get_sysconfigdata_name():
+@@ -384,7 +384,7 @@ def _get_sysconfigdata_name():
      multiarch = getattr(sys.implementation, '_multiarch', '')
      return os.environ.get(
          '_PYTHON_SYSCONFIGDATA_NAME',