Skip to content

Commit 0b98838

Browse files
committed
Merge remote-tracking branch 'origin/main' into bump_multissl_awslc
2 parents 8f9044b + f1446d3 commit 0b98838

File tree

568 files changed

+26411
-21942
lines changed

Some content is hidden

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

568 files changed

+26411
-21942
lines changed

.github/CODEOWNERS

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@
6363
.azure-pipelines/ @AA-Turner
6464

6565
# GitHub & related scripts
66-
.github/ @ezio-melotti @hugovk @AA-Turner @webknjaz
67-
Tools/build/compute-changes.py @AA-Turner @hugovk @webknjaz
68-
Tools/build/verify_ensurepip_wheels.py @AA-Turner @pfmoore @pradyunsg
66+
.github/ @ezio-melotti @hugovk @AA-Turner @webknjaz
67+
Tools/build/compute-changes.py @AA-Turner @hugovk @webknjaz
68+
Lib/test/test_tools/test_compute_changes.py @AA-Turner @hugovk @webknjaz
69+
Tools/build/verify_ensurepip_wheels.py @AA-Turner @pfmoore @pradyunsg
6970

7071
# Pre-commit
7172
.pre-commit-config.yaml @hugovk
@@ -110,6 +111,7 @@ Doc/tools/ @AA-Turner @hugovk
110111
.readthedocs.yml @AA-Turner
111112

112113
# Sections
114+
Doc/c-api/ @ZeroIntensity
113115
Doc/reference/ @willingc @AA-Turner
114116
Doc/whatsnew/ @AA-Turner
115117

@@ -287,11 +289,17 @@ Programs/_bootstrap_python.c @ericsnowcurrently
287289
Programs/python.c @ericsnowcurrently
288290

289291
# JIT
292+
.github/workflows/jit.yml @savannahostrowski
290293
Include/internal/pycore_jit.h @brandtbucher @savannahostrowski @diegorusso
291294
Python/jit.c @brandtbucher @savannahostrowski @diegorusso
292295
Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
293296
InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-Turner
294297

298+
# Lazy imports (PEP 810)
299+
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
300+
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
301+
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
302+
295303
# Micro-op / μop / Tier 2 Optimiser
296304
Python/optimizer.c @markshannon @Fidget-Spinner
297305
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
@@ -417,18 +425,19 @@ Lib/dataclasses.py @ericvsmith
417425
Lib/test/test_dataclasses/ @ericvsmith
418426

419427
# Dates and times
420-
Doc/**/*time.rst @pganssle @abalkin
421-
Doc/library/zoneinfo.rst @pganssle
422-
Include/datetime.h @pganssle @abalkin
423-
Include/internal/pycore_time.h @pganssle @abalkin
424-
Lib/test/test_zoneinfo/ @pganssle
425-
Lib/zoneinfo/ @pganssle
426-
Lib/*time.py @pganssle @abalkin
427-
Lib/test/datetimetester.py @pganssle @abalkin
428-
Lib/test/test_*time.py @pganssle @abalkin
429-
Modules/*zoneinfo* @pganssle
430-
Modules/*time* @pganssle @abalkin
431-
Python/pytime.c @pganssle @abalkin
428+
Doc/**/*time.rst @pganssle @abalkin @StanFromIreland
429+
Doc/library/datetime-* @pganssle @StanFromIreland
430+
Doc/library/zoneinfo.rst @pganssle @StanFromIreland
431+
Include/datetime.h @pganssle @abalkin @StanFromIreland
432+
Include/internal/pycore_time.h @pganssle @abalkin @StanFromIreland
433+
Lib/test/test_zoneinfo/ @pganssle @StanFromIreland
434+
Lib/zoneinfo/ @pganssle @StanFromIreland
435+
Lib/*time.py @pganssle @abalkin @StanFromIreland
436+
Lib/test/datetimetester.py @pganssle @abalkin @StanFromIreland
437+
Lib/test/test_*time.py @pganssle @abalkin @StanFromIreland
438+
Modules/*zoneinfo* @pganssle @StanFromIreland
439+
Modules/*time* @pganssle @abalkin @StanFromIreland
440+
Python/pytime.c @pganssle @abalkin @StanFromIreland
432441

433442
# Dbm
434443
Doc/library/dbm.rst @corona10 @erlend-aasland @serhiy-storchaka
@@ -467,8 +476,9 @@ Lib/test/test_functools.py @rhettinger
467476
Modules/_functoolsmodule.c @rhettinger
468477

469478
# Garbage collector
470-
Modules/gcmodule.c @pablogsal
471-
Doc/library/gc.rst @pablogsal
479+
Modules/gcmodule.c @pablogsal
480+
Doc/library/gc.rst @pablogsal
481+
InternalDocs/garbage_collector.md @pablogsal
472482

473483
# Gettext
474484
Doc/library/gettext.rst @tomasr8

.github/ISSUE_TEMPLATE/documentation.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ body:
88
> [!NOTE]
99
> Trivial changes (for example typos) don’t require an issue before opening a PR.
1010
- type: textarea
11+
id: description
1112
attributes:
1213
label: "Documentation"
13-
description: "A clear and concise description of the issue."
14+
description: "A clear and concise description of the issue. Include a link to the page."
1415
validations:
1516
required: true

.github/workflows/build.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ jobs:
111111
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
112112
- name: Install dependencies
113113
run: sudo ./.github/workflows/posix-deps-apt.sh
114-
- name: Add ccache to PATH
115-
run: echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
116114
- name: Configure CPython
117115
run: |
118116
# Build Python with the libpython dynamic library
@@ -242,11 +240,18 @@ jobs:
242240
# BOLT currently crashes during instrumentation on aarch64
243241
- os: ubuntu-24.04-arm
244242
bolt: true
243+
include:
244+
# Enable CPU-intensive tests on ARM (default build only)
245+
- os: ubuntu-24.04-arm
246+
bolt: false
247+
free-threading: false
248+
test-opts: '-u cpu'
245249
uses: ./.github/workflows/reusable-ubuntu.yml
246250
with:
247251
bolt-optimizations: ${{ matrix.bolt }}
248252
free-threading: ${{ matrix.free-threading }}
249253
os: ${{ matrix.os }}
254+
test-opts: ${{ matrix.test-opts || '' }}
250255

251256
build-ubuntu-ssltests:
252257
name: 'Ubuntu SSL tests'
@@ -301,9 +306,6 @@ jobs:
301306
--base-directory "$MULTISSL_DIR" \
302307
--${{ matrix.ssllib.name }} ${{ matrix.ssllib.version }} \
303308
--system Linux
304-
- name: Add ccache to PATH
305-
run: |
306-
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
307309
- name: Configure CPython
308310
run: |
309311
./configure CFLAGS="-fdiagnostics-format=json" \
@@ -380,7 +382,7 @@ jobs:
380382
needs: build-context
381383
if: needs.build-context.outputs.run-ubuntu == 'true'
382384
env:
383-
OPENSSL_VER: 3.0.18
385+
OPENSSL_VER: 3.5.5
384386
PYTHONSTRICTEXTENSIONBUILD: 1
385387
steps:
386388
- uses: actions/checkout@v6
@@ -404,9 +406,6 @@ jobs:
404406
- name: Install OpenSSL
405407
if: steps.cache-openssl.outputs.cache-hit != 'true'
406408
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
407-
- name: Add ccache to PATH
408-
run: |
409-
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
410409
- name: Setup directory envs for out-of-tree builds
411410
run: |
412411
echo "CPYTHON_RO_SRCDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-ro-srcdir)" >> "$GITHUB_ENV"
@@ -491,7 +490,7 @@ jobs:
491490
matrix:
492491
os: [ubuntu-24.04]
493492
env:
494-
OPENSSL_VER: 3.0.18
493+
OPENSSL_VER: 3.5.5
495494
PYTHONSTRICTEXTENSIONBUILD: 1
496495
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
497496
steps:
@@ -522,11 +521,8 @@ jobs:
522521
- name: Install OpenSSL
523522
if: steps.cache-openssl.outputs.cache-hit != 'true'
524523
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
525-
- name: Add ccache to PATH
526-
run: |
527-
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
528524
- name: Configure CPython
529-
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
525+
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc --with-openssl="$OPENSSL_DIR"
530526
- name: Build CPython
531527
run: make -j4
532528
- name: Display build info

0 commit comments

Comments
 (0)