Add support for Python 3.14 on macOS and GNU Linux #443

zanieb · 2024-12-18T21:21:44Z

The biggest change seems to be around blake2's implementation.

I figure I'll follow-up on musl Linux separately.

cpython-unix/build-main.py

zanieb · 2024-12-19T04:31:18Z

Investigating the removal of blake2 in python/cpython#99108 — not yet sure what I need to do to make the new hash implementation available. python/cpython#119316 is pretty helpful. I got this passing on macOS locally — we'll see if it works for Linux too.

zanieb · 2024-12-19T06:04:47Z

pythonbuild/cpython.py

@@ -511,7 +511,10 @@ def derive_setup_local(
            )

            if target_match and (python_min_match and python_max_match):


The changes in this file in support of an ergonomic expression in d0521dd

zanieb · 2024-12-19T14:17:26Z

There are some problems on the x86_64 cross-compiles, seemingly due to the macOS SDK version, which we'll probably just want to bump to match the upstream

cpython-3.14> ./Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c:523:40: error: 'aligned_alloc' is only available on macOS 10.15 or newer [-Werror,-Wunguarded-availability-new]
cpython-3.14>   523 |     (Lib_IntVector_Intrinsics_vec128 *)KRML_ALIGNED_MALLOC(16,
cpython-3.14>       |                                        ^~~~~~~~~~~~~~~~~~~~~~~
cpython-3.14>   524 |       sizeof (Lib_IntVector_Intrinsics_vec128) * 4U);
cpython-3.14>       |       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cpython-3.14> ./Modules/_hacl/include/krml/internal/target.h:137:39: note: expanded from macro 'KRML_ALIGNED_MALLOC'
cpython-3.14>   137 | #    define KRML_ALIGNED_MALLOC(X, Y) aligned_alloc(X, Y)
cpython-3.14>       |                                       ^~~~~~~~~~~~~

Though the upstream only bumped to 10.13 in Python 3.13

The minimum supported macOS version was changed from 10.9 to 10.13 (High Sierra). Older macOS versions will not be supported going forward

Stashing a ref to python/cpython#123748 (comment) which may be helpful

indygreg · 2024-12-19T15:03:12Z

If upstream bumped the minimum macOS version from 10.9, we should follow. (10.9 is ancient!)

In the past, upstream has failed to conditionally guard symbol usage from newer SDK versions. This is one of the reasons I added the compiler flag to turn unguarded availability warnings into hard errors.

IMO upstream should validate the minimum SDK is no less than supported at configure time. They should also turn unguarded availability warnings into errors. I'm unsure if they do either.

zanieb · 2024-12-19T15:52:18Z

If upstream bumped the minimum macOS version from 10.9, we should follow. (10.9 is ancient!)

They bumped to 10.13 for the macOS installer but I believe older versions are still supported when building from source.

I'm tempted to bump to 10.15 regardless, but... it sounds like we're catching legitimate mistakes upstream here.

See zanieb#6 (comment) for similar experience with the 3.13 builds.

In the past, upstream has failed to conditionally guard symbol usage from newer SDK versions. This is one of the reasons I added the compiler flag to turn unguarded availability warnings into hard errors.

Yeah that makes sense, I'll investigate upstream.

zanieb · 2024-12-19T20:53:45Z

Okay now the macOS x86_64 builds are just failing validation with

error: wanted platform tag macosx-10.9-x86_64; got darwin-x86_64

And the Linux v2/v3/v4 PGO builds are failing in the test suite with

test_datetime failed

zanieb · 2024-12-19T21:33:15Z

And.. after fighting the test suite to let me get verbose output on PGO failures

cpython-3.14> test_system_transitions (test.datetimetester.ZoneInfoTest_Fast.test_system_transitions) ... ok
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=1, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '1-01-01' != '0001-01-01'
cpython-3.14> - 1-01-01
cpython-3.14> + 0001-01-01
cpython-3.14> ? +++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=1, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=48, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '48-01-01' != '0048-01-01'
cpython-3.14> - 48-01-01
cpython-3.14> + 0048-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=48, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=70, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '70-01-01' != '0070-01-01'
cpython-3.14> - 70-01-01
cpython-3.14> + 0070-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=70, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=999, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '999-01-01' != '0999-01-01'
cpython-3.14> - 999-01-01
cpython-3.14> + 0999-01-01
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDate_Fast.test_strftime_y2k) (year=999, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '9' != '09'
cpython-3.14> - 9
cpython-3.14> + 09
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=1, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '1-01-01' != '0001-01-01'
cpython-3.14> - 1-01-01
cpython-3.14> + 0001-01-01
cpython-3.14> ? +++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=1, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=48, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '48-01-01' != '0048-01-01'
cpython-3.14> - 48-01-01
cpython-3.14> + 0048-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=48, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=70, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '70-01-01' != '0070-01-01'
cpython-3.14> - 70-01-01
cpython-3.14> + 0070-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=70, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=999, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '999-01-01' != '0999-01-01'
cpython-3.14> - 999-01-01
cpython-3.14> + 0999-01-01
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTime_Fast.test_strftime_y2k) (year=999, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '9' != '09'
cpython-3.14> - 9
cpython-3.14> + 09
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=1, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '1-01-01' != '0001-01-01'
cpython-3.14> - 1-01-01
cpython-3.14> + 0001-01-01
cpython-3.14> ? +++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=1, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=48, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '48-01-01' != '0048-01-01'
cpython-3.14> - 48-01-01
cpython-3.14> + 0048-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=48, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=70, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '70-01-01' != '0070-01-01'
cpython-3.14> - 70-01-01
cpython-3.14> + 0070-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=70, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=999, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '999-01-01' != '0999-01-01'
cpython-3.14> - 999-01-01
cpython-3.14> + 0999-01-01
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestDateTimeTZ_Fast.test_strftime_y2k) (year=999, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '9' != '09'
cpython-3.14> - 9
cpython-3.14> + 09
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=1, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '1-01-01' != '0001-01-01'
cpython-3.14> - 1-01-01
cpython-3.14> + 0001-01-01
cpython-3.14> ? +++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=1, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=48, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '48-01-01' != '0048-01-01'
cpython-3.14> - 48-01-01
cpython-3.14> + 0048-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=48, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=70, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '70-01-01' != '0070-01-01'
cpython-3.14> - 70-01-01
cpython-3.14> + 0070-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=70, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=99, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '99-01-01' != '0099-01-01'
cpython-3.14> - 99-01-01
cpython-3.14> + 0099-01-01
cpython-3.14> ? ++
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=99, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '0' != '00'
cpython-3.14> - 0
cpython-3.14> + 00
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTi
cpython-3.14> me_Fast.test_strftime_y2k) (year=999, specifier='F')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '999-01-01' != '0999-01-01'
cpython-3.14> - 999-01-01
cpython-3.14> + 0999-01-01
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ======================================================================
cpython-3.14> FAIL: test_strftime_y2k (test.datetimetester.TestSubclassDateTime_Fast.test_strftime_y2k) (year=999, specifier='C')
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Traceback (most recent call last):
cpython-3.14>   File "/build/Python-3.14.0a3/Lib/test/datetimetester.py", line 1814, in test_strftime_y2k
cpython-3.14>     self.assertEqual(d.strftime(f"%{specifier}"), expected)
cpython-3.14>     ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cpython-3.14> AssertionError: '9' != '09'
cpython-3.14> - 9
cpython-3.14> + 09
cpython-3.14> ? +
cpython-3.14> 
cpython-3.14> 
cpython-3.14> ----------------------------------------------------------------------
cpython-3.14> Ran 1058 tests in 3.495s
cpython-3.14> 
cpython-3.14> FAILED (failures=48, skipped=52)
cpython-3.14> test test_datetime failed

I think we have to skip this test for now, ref python/cpython#128104

zanieb · 2024-12-19T22:56:48Z

cpython-unix/patch-apple-cross-3.14.patch

+# The _PYTHON_HOST_PLATFORM environment variable is used to
+# override the platform name in distutils and sysconfig when
+# cross-compiling. On Apple, the platform name expansion logic
+# is non-trivial, including renaming MACHDEP=darwin to macosx
+# and including the deployment target (or current OS version if
+# not set). Here we always force an override based on the target
+# triple. We do this in all build configurations because historically
+# the automatic resolution has been brittle.
+case "$host" in
+aarch64-apple-darwin*)
+  _PYTHON_HOST_PLATFORM="macosx-${MACOSX_DEPLOYMENT_TARGET}-arm64"
+  ;;
+x86_64-apple-darwin*)
+  _PYTHON_HOST_PLATFORM="macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64"
+  ;;
+esac


I tried to remove this, but we still need it to avoid sys.platform() returning darwin — we assert that it matches this format in our validation.

cpython-unix/patch-apple-cross-3.14.patch

…itional`

This is required for the new `_blake2` implementations, we should also upstream runtime checks

To attempt to fix `_hacl` missing symbols

zanieb · 2024-12-19T23:01:28Z

cpython-unix/targets.yml

-    - '-mmacosx-version-min=10.9'
+    - '-mmacosx-version-min=10.15'


I think this is fine, but we should also probably fix the upstream to use weak symbols here.

See

HACL Blake2 implementation does not check for aligned_alloc availability on macOS python/cpython#128134

gh-127897: fix HACL* build on macOS/Catalina python/cpython#127932

We could revert this for the next alpha, if we wanted.

This is currently unconditional and applies to other CPython versions.

I think it's fine regardless.

zanieb · 2024-12-19T23:03:16Z

ci-matrix.py

+    if (
+        filters.get("libc")
+        and entry.get("libc")
+        and entry["libc"] not in filters["libc"]
+    ):


This was a bug that disabled the macOS builds in the matrix if libc labels were requested.

zanieb · 2024-12-20T19:03:43Z

pythonbuild/cpython.py

@@ -549,7 +552,11 @@ def derive_setup_local(
            )

            if target_match and (python_min_match and python_max_match):
-                line += f" -I{entry['path']}"
+                # TODO: Change to `include` and drop support for `path`


On the fence on this, but think we can just revisit it holistically separately.

zanieb · 2024-12-20T19:04:00Z

pythonbuild/cpython.py

+            if targets := entry.get("targets", []):
+                target_match = any(re.match(p, target_triple) for p in targets)
+            else:
+                target_match = True
+
+            python_min_match = meets_python_minimum_version(
+                python_version, entry.get("minimum-python-version", "1.0")
+            )
+            python_max_match = meets_python_maximum_version(
+                python_version, entry.get("maximum-python-version", "100.0")
+            )
+
+            if target_match and (python_min_match and python_max_match):


Copied from other cases where we support Python versions here.

Linux cross-compiles are failing on `main` @ 01cfc3b due to `readelf` missing. We drop this check as part of the Apple cross compilation patch but since #443 we no longer apply that patch on Linux. This moves the patch out into a separate file and applies it when cross-compiling on Python <=3.12 where it is relevant.

zanieb added platform:linux Specific to the Linux platform python:3.14 labels Dec 18, 2024

zanieb changed the title ~~Add support for Python 3.13 on GNU Linux~~ Add support for Python 3.14 on GNU Linux Dec 18, 2024

zanieb added libc:gnu build:noopt labels Dec 18, 2024

zanieb force-pushed the zb/314-gnu branch from 6205acc to bf27973 Compare December 18, 2024 21:32

indygreg reviewed Dec 18, 2024

View reviewed changes

cpython-unix/build-main.py Show resolved Hide resolved

zanieb force-pushed the zb/314-gnu branch from bf27973 to 2ac4fd6 Compare December 18, 2024 21:51

This comment was marked as outdated.

Sign in to view

zanieb added the platform:darwin Specific to the macOS platform label Dec 18, 2024

zanieb force-pushed the zb/314-gnu branch from 6d2d5a2 to d2dc611 Compare December 18, 2024 23:57

zanieb changed the title ~~Add support for Python 3.14 on GNU Linux~~ Add support for Python 3.14 on macOS and GNU Linux Dec 18, 2024

zanieb marked this pull request as ready for review December 19, 2024 00:36

zanieb removed the build:noopt label Dec 19, 2024

zanieb force-pushed the zb/314-gnu branch from d2dc611 to 4960c16 Compare December 19, 2024 00:39

This comment was marked as outdated.

Sign in to view

zanieb marked this pull request as draft December 19, 2024 05:27

zanieb commented Dec 19, 2024

View reviewed changes

This comment was marked as outdated.

Sign in to view

zanieb force-pushed the zb/314-gnu branch from 889444a to 24d2994 Compare December 19, 2024 18:08

zanieb added the arch:x86_64 label Dec 19, 2024

zanieb marked this pull request as ready for review December 19, 2024 22:33

zanieb commented Dec 19, 2024

View reviewed changes

cpython-unix/patch-apple-cross-3.14.patch Outdated Show resolved Hide resolved

zanieb added 19 commits December 19, 2024 16:59

Only apply Apple cross-compile patches on macOS

cd9dbfd

Apply 3.13 apple-cross patch to 3.14

dc6a50f

Fix "runshared" patch on 3.14

6ec00cf

Drop _blake2 from expected extension modules

2094ced

Use meets_python_minimum_version for free-threaded safety check

0e5f479

Add 3.14 to validation

d5131a5

Enable 3.14 for macOS builds

871c190

Fix libc filtering in the matrix generator

7869c0a

Add multiple path support to includes-conditional and `sources-cond…

de2aea3

…itional`

Add min/max-python-version support to links-conditional

76d9da1

Split _blake extension configuratoin for 3.14

dd15340

Bump minimum macOS version from 10.9 -> 10.15 on x86_64

33b1bee

This is required for the new `_blake2` implementations, we should also upstream runtime checks

Add _BSD_SOURCE and _DEFAULT_SOURCE

504468a

To attempt to fix `_hacl` missing symbols

Set ac_cv_func_explicit_bzero=no

9dd6bd5

Fix cross-compilation for macOS x86_64

eaa5ab9

Set LINUX_NO_EXPLICIT_BZERO for _blake separately

e1c604b

Update expected macosx target and fix patch

9e61d1f

Ignore test_strftime_y2k when cross-compiling on Linux for 3.14+

5fdcd3d

Remove 3.14 cross-path — it matches 3.13

2f4fa03

zanieb force-pushed the zb/314-gnu branch from 266775d to 2f4fa03 Compare December 19, 2024 22:59

zanieb commented Dec 19, 2024

View reviewed changes

Restore _blake2 to global expected extension modules

7055071

zanieb commented Dec 20, 2024

View reviewed changes

charliermarsh approved these changes Dec 20, 2024

View reviewed changes

zanieb merged commit 01cfc3b into main Dec 20, 2024
35 checks passed

zanieb deleted the zb/314-gnu branch December 20, 2024 19:50

zanieb mentioned this pull request Dec 20, 2024

Apply readelf patch for cross-compiling on older Python versions #452

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Python 3.14 on macOS and GNU Linux #443

Add support for Python 3.14 on macOS and GNU Linux #443

zanieb commented Dec 18, 2024 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb Dec 19, 2024

zanieb commented Dec 19, 2024 •

edited

Loading

This comment was marked as outdated.

indygreg commented Dec 19, 2024

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb Dec 19, 2024

zanieb Dec 19, 2024

zanieb Dec 20, 2024

zanieb Dec 19, 2024

zanieb Dec 20, 2024

zanieb Dec 20, 2024

		@@ -511,7 +511,10 @@ def derive_setup_local(
		)

		if target_match and (python_min_match and python_max_match):

Add support for Python 3.14 on macOS and GNU Linux #443

Add support for Python 3.14 on macOS and GNU Linux #443

Conversation

zanieb commented Dec 18, 2024 • edited Loading

This comment was marked as outdated.

This comment was marked as outdated.

zanieb commented Dec 19, 2024 • edited Loading

zanieb Dec 19, 2024

Choose a reason for hiding this comment

zanieb commented Dec 19, 2024 • edited Loading

This comment was marked as outdated.

indygreg commented Dec 19, 2024

zanieb commented Dec 19, 2024 • edited Loading

zanieb commented Dec 19, 2024 • edited Loading

zanieb commented Dec 19, 2024 • edited Loading

zanieb Dec 19, 2024

Choose a reason for hiding this comment

zanieb Dec 19, 2024

Choose a reason for hiding this comment

zanieb Dec 20, 2024

Choose a reason for hiding this comment

zanieb Dec 19, 2024

Choose a reason for hiding this comment

zanieb Dec 20, 2024

Choose a reason for hiding this comment

zanieb Dec 20, 2024

Choose a reason for hiding this comment

zanieb commented Dec 18, 2024 •

edited

Loading

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb commented Dec 19, 2024 •

edited

Loading

zanieb commented Dec 19, 2024 •

edited

Loading