Skip to content

Commit 9d6b95d

Browse files
yoneyyoney
committed
Merge remote-tracking branch 'upstream/main' into ft_mmap
2 parents 01cad24 + 3195da0 commit 9d6b95d

96 files changed

Lines changed: 2795 additions & 1611 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ Modules/makesetup @erlend-aasland @AA-Turner @emmatyping
8686
Modules/Setup* @erlend-aasland @AA-Turner @emmatyping
8787
Tools/build/regen-configure.sh @AA-Turner
8888

89+
# generate-build-details
90+
Tools/build/generate-build-details.py @FFY00
91+
Lib/test/test_build_details.py @FFY00
92+
8993

9094
# ----------------------------------------------------------------------------
9195
# Documentation
@@ -241,10 +245,10 @@ Lib/test/test_getpath.py @FFY00
241245
Modules/getpath* @FFY00
242246

243247
# Hashing / ``hash()`` and related
244-
Include/cpython/pyhash.h @gpshead @picnixz @tiran
245-
Include/internal/pycore_pyhash.h @gpshead @picnixz @tiran
246-
Include/pyhash.h @gpshead @picnixz @tiran
247-
Python/pyhash.c @gpshead @picnixz @tiran
248+
Include/cpython/pyhash.h @gpshead @picnixz
249+
Include/internal/pycore_pyhash.h @gpshead @picnixz
250+
Include/pyhash.h @gpshead @picnixz
251+
Python/pyhash.c @gpshead @picnixz
248252

249253
# The import system (including importlib)
250254
**/*import* @brettcannon @ericsnowcurrently @ncoghlan @warsaw
@@ -371,14 +375,14 @@ Lib/calendar.py @AA-Turner
371375
Lib/test/test_calendar.py @AA-Turner
372376

373377
# Cryptographic Primitives and Applications
374-
**/*hashlib* @gpshead @picnixz @tiran
375-
**/*hashopenssl* @gpshead @picnixz @tiran
378+
**/*hashlib* @gpshead @picnixz
379+
**/*hashopenssl* @gpshead @picnixz
376380
**/*hmac* @gpshead @picnixz
377381
**/*ssl* @gpshead @picnixz
378382
Modules/_hacl/ @gpshead @picnixz
379-
Modules/*blake* @gpshead @picnixz @tiran
380-
Modules/*md5* @gpshead @picnixz @tiran
381-
Modules/*sha* @gpshead @picnixz @tiran
383+
Modules/*blake* @gpshead @picnixz
384+
Modules/*md5* @gpshead @picnixz
385+
Modules/*sha* @gpshead @picnixz
382386

383387
# Codecs
384388
Modules/cjkcodecs/ @corona10

‎.github/actionlint.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
self-hosted-runner:
22
# Pending https://github.com/rhysd/actionlint/issues/533
3-
labels: ["windows-11-arm"]
3+
# and https://github.com/rhysd/actionlint/issues/571
4+
labels: ["windows-11-arm", "macos-15-intel"]
45

56
config-variables: null
67

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,13 @@ jobs:
202202
strategy:
203203
fail-fast: false
204204
matrix:
205-
# Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
205+
# Cirrus and macos-14 are M1, macos-15-intel is default GHA Intel.
206206
# macOS 13 only runs tests against the GIL-enabled CPython.
207207
# Cirrus used for upstream, macos-14 for forks.
208208
os:
209209
- ghcr.io/cirruslabs/macos-runner:sonoma
210210
- macos-14
211-
- macos-13
211+
- macos-15-intel
212212
is-fork: # only used for the exclusion trick
213213
- ${{ github.repository_owner != 'python' }}
214214
free-threading:
@@ -219,7 +219,7 @@ jobs:
219219
is-fork: true
220220
- os: macos-14
221221
is-fork: false
222-
- os: macos-13
222+
- os: macos-15-intel
223223
free-threading: true
224224
uses: ./.github/workflows/reusable-macos.yml
225225
with:
@@ -273,7 +273,7 @@ jobs:
273273
# Keep 1.1.1w in our list despite it being upstream EOL and otherwise
274274
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
275275
# supported by important vendors such as AWS-LC.
276-
openssl_ver: [1.1.1w, 3.0.17, 3.2.5, 3.3.4, 3.4.2, 3.5.2]
276+
openssl_ver: [1.1.1w, 3.0.18, 3.2.6, 3.3.5, 3.4.3, 3.5.4]
277277
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
278278
env:
279279
OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -438,7 +438,7 @@ jobs:
438438
needs: build-context
439439
if: needs.build-context.outputs.run-tests == 'true'
440440
env:
441-
OPENSSL_VER: 3.0.16
441+
OPENSSL_VER: 3.0.18
442442
PYTHONSTRICTEXTENSIONBUILD: 1
443443
steps:
444444
- uses: actions/checkout@v4
@@ -558,7 +558,7 @@ jobs:
558558
matrix:
559559
os: [ubuntu-24.04]
560560
env:
561-
OPENSSL_VER: 3.0.16
561+
OPENSSL_VER: 3.0.18
562562
PYTHONSTRICTEXTENSIONBUILD: 1
563563
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
564564
steps:

‎.github/workflows/jit.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
runner: windows-11-arm
8282
- target: x86_64-apple-darwin/clang
8383
architecture: x86_64
84-
runner: macos-13
84+
runner: macos-15-intel
8585
- target: aarch64-apple-darwin/clang
8686
architecture: aarch64
8787
runner: macos-14
@@ -106,15 +106,10 @@ jobs:
106106
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
107107
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
108108
109-
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
110-
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
111-
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
112-
# the symlink to the pre-installed Python so that the Homebrew Python is used instead.
113109
- name: macOS
114110
if: runner.os == 'macOS'
115111
run: |
116112
brew update
117-
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
118113
brew install llvm@${{ matrix.llvm }}
119114
export SDKROOT="$(xcrun --show-sdk-path)"
120115
# Set MACOSX_DEPLOYMENT_TARGET and -Werror=unguarded-availability to

‎.github/workflows/project-updater.yml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.github/workflows/reusable-macos.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ jobs:
6060
--prefix=/opt/python-dev \
6161
--with-openssl="$(brew --prefix [email protected])"
6262
- name: Build CPython
63-
if : ${{ inputs.free-threading || inputs.os != 'macos-13' }}
63+
if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
6464
run: gmake -j8
6565
- name: Build CPython for compiler warning check
66-
if : ${{ !inputs.free-threading && inputs.os == 'macos-13' }}
66+
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
6767
run: set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt
6868
- name: Display build info
6969
run: make pythoninfo
7070
- name: Check compiler warnings
71-
if : ${{ !inputs.free-threading && inputs.os == 'macos-13' }}
71+
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
7272
run: >-
7373
python3 Tools/build/check_warnings.py
7474
--compiler-output-file-path=compiler_output_macos.txt

‎.github/workflows/reusable-ubuntu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ${{ inputs.os }}
3131
timeout-minutes: 60
3232
env:
33-
OPENSSL_VER: 3.0.15
33+
OPENSSL_VER: 3.0.18
3434
PYTHONSTRICTEXTENSIONBUILD: 1
3535
TERM: linux
3636
steps:

‎.github/workflows/tail-call.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# runner: windows-2022
5959
- target: x86_64-apple-darwin/clang
6060
architecture: x86_64
61-
runner: macos-13
61+
runner: macos-15-intel
6262
- target: aarch64-apple-darwin/clang
6363
architecture: aarch64
6464
runner: macos-14
@@ -101,17 +101,10 @@ jobs:
101101
set LLVMInstallDir=C:\Program Files\LLVM
102102
./PCbuild/build.bat --tail-call-interp -p ${{ matrix.architecture }}
103103
104-
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
105-
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
106-
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
107-
# the symlink to the pre-installed Python so that the Homebrew Python is used instead.
108-
# Note: when a new LLVM is released, the homebrew installation directory changes, so the builds will fail.
109-
# We either need to upgrade LLVM or change the directory being pointed to.
110104
- name: Native macOS (release)
111105
if: runner.os == 'macOS'
112106
run: |
113107
brew update
114-
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
115108
brew install llvm@${{ matrix.llvm }}
116109
export SDKROOT="$(xcrun --show-sdk-path)"
117110
export PATH="/usr/local/opt/llvm@${{ matrix.llvm }}/bin:$PATH"

‎Android/android.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,16 @@ def make_build_python(context):
184184
run(["make", "-j", str(os.cpu_count())])
185185

186186

187+
# To create new builds of these dependencies, usually all that's necessary is to
188+
# push a tag to the cpython-android-source-deps repository, and GitHub Actions
189+
# will do the rest.
190+
#
191+
# If you're a member of the Python core team, and you'd like to be able to push
192+
# these tags yourself, please contact Malcolm Smith or Russell Keith-Magee.
187193
def unpack_deps(host, prefix_dir):
188194
os.chdir(prefix_dir)
189195
deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
190-
for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.15-4",
196+
for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.18-0",
191197
"sqlite-3.50.4-0", "xz-5.4.6-1", "zstd-1.5.7-1"]:
192198
filename = f"{name_ver}-{host}.tar.gz"
193199
download(f"{deps_url}/{name_ver}/{filename}")

‎Apple/__main__.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,18 @@ def unpack_deps(
312312
On iOS, as a safety mechanism, any dynamic libraries will be purged from
313313
the unpacked dependencies.
314314
"""
315+
# To create new builds of these dependencies, usually all that's necessary
316+
# is to push a tag to the cpython-apple-source-deps repository, and GitHub
317+
# Actions will do the rest.
318+
#
319+
# If you're a member of the Python core team, and you'd like to be able to
320+
# push these tags yourself, please contact Malcolm Smith or Russell
321+
# Keith-Magee.
315322
deps_url = "https://github.com/beeware/cpython-apple-source-deps/releases/download"
316323
for name_ver in [
317324
"BZip2-1.0.8-2",
318325
"libFFI-3.4.7-2",
319-
"OpenSSL-3.0.17-1",
326+
"OpenSSL-3.0.18-1",
320327
"XZ-5.6.4-2",
321328
"mpdecimal-4.0.0-2",
322329
"zstd-1.5.7-1",

0 commit comments

Comments
 (0)