Skip to content

Sync upstream tag 20260602#13

Draft
Schamper wants to merge 19 commits into
mainfrom
sync/20260602
Draft

Sync upstream tag 20260602#13
Schamper wants to merge 19 commits into
mainfrom
sync/20260602

Conversation

@Schamper
Copy link
Copy Markdown
Member

@Schamper Schamper commented Jun 3, 2026

Warning

Merge conflicts detected when merging upstream tag 20260602 into main.
The conflict markers have been committed so they are visible in the PR diff.

Conflicting files

.github/workflows/macos.yml
.github/workflows/windows.yml
ci-matrix.py
cpython-unix/build-cpython.sh
cpython-windows/build.py
src/validation.rs

Resolution

git fetch origin
git checkout sync/20260602
# Resolve conflict markers
git add -A && git commit -m "Resolve merge conflicts for 20260602"
git push origin sync/20260602

geofft and others added 19 commits April 16, 2026 16:09
As reported in astral-sh#956, executable stacks cause thread creation to fail
under MemoryDenyWriteExecute=true. In kernel 6.3+ (which the GitHub
Actions runners should have) this is implemented using
prctl(PR_SET_MDWE). In older versions systemd uses a more complicated
seccomp filter.
…h#1075)

Currently, pull requests run all targets by default and labels can be
used to select a subset of the matrix. However, CI is quite expensive
and it's very rare to need to test the whole matrix, so the default is a
bit backwards.

In this change, we update pull requests to run on a subset of targets by
default: Python 3.14 on macOS, Linux, and Windows with the most popular
architecture. We include both glibc and musl variants of Linux. We
include armv7 as an arbitrary cross-compile case — I'd be happy to take
suggestions on an alternative there.

This breaks our labeling concept a bit, as our labels currently do pure
subsetting of the matrix. The labels will continue to subset, but with
some nuances:

- Applying a label will generally subset the default selection, e.g.,
`platform:linux` will only run the Linux subset of the defaults
described above.
- Labels that would null the default subset, e.g., `python:3.12` or
`build:debug`, will instead change the default set to target that
variant.
- There are new `platform:all`, `python:all`, `arch:all`, `libc:all`,
and `build:all` labels that can be used to expand the targets.
Statically link `python` to `libpython` on macOS. 

A dynamic `libpython` is still built and included in the distribution
for embedded use.

Remove patches that disable linking the libraries in statically linked
Python stdlib modules to python as these are now needed.

closes astral-sh#636
…sh#1104)

Remove the Tcl/Tk translation files (.msg) and the Tk demos from the
distribution artifacts. The former would only be needed in edge cases
and the later is never be needed.

closes astral-sh#1095
This patch addresses a segmentation fault issue on `LoongArch64`
platforms caused by incorrect ELF segment alignment during the build
process.

- fix: astral-sh#1106

Signed-off-by: 吴小白 <296015668@qq.com>
* Update CPython 3.15 to 3.15.0b1
* Update CPython 3.14.5rc1 -> 3.14.5
Use the same LLVM toolchain that is used for native x86-64 builds to
cross compile for riscv64 using a sysroot.
Following the behavior of CPython which dropped uplink support in 3.12,
build OpenSSL with the `no-uplink` option starting with CPython 3.12.

This allows a SSLContext to be created even when a SSLKEYLOGFILE
environment variable is set on Windows.

closes astral-sh#640
Include vm_sockets.h which is missing from the kernel UAPI headers in
version 3.16 of the kernel. This file is missing due to a typo in the
Kbuild file. The file is needed for CPython to make socket.AF_VSOCK
available.

closes astral-sh#1050
Signed-off-by: Mohammad Miadh Angkad <176301910+mmangkad@users.noreply.github.com>
3.15.0b1 -> 3.15.0b2.

Remove patch introduced in astral-sh#1123 as a different fix was merged upstream
in python/cpython#149799
This makes astral-sh#1130 unnecessary
@Schamper Schamper added the sync Automated upstream sync label Jun 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sync Automated upstream sync

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants