Skip to content

Commit d2426cc

Browse files
authored
Merge branch 'main' into whatsnew-shelve-custom-serialization
2 parents 00f6a98 + 812ef66 commit d2426cc

File tree

911 files changed

+49023
-28192
lines changed

Some content is hidden

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

911 files changed

+49023
-28192
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ Python/executor_cases.c.h generated
106106
Python/generated_cases.c.h generated
107107
Python/optimizer_cases.c.h generated
108108
Python/opcode_targets.h generated
109+
Python/record_functions.c.h generated
109110
Python/stdlib_module_names.h generated
110111
Tools/peg_generator/pegen/grammar_parser.py generated
111112
aclocal.m4 generated

.github/CODEOWNERS

Lines changed: 16 additions & 5 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,18 @@ 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_import/test_lazy_imports.py @yhg1s @DinoV @pablogsal
302+
Lib/test/test_import/data/lazy_imports/ @yhg1s @DinoV @pablogsal
303+
295304
# Micro-op / μop / Tier 2 Optimiser
296305
Python/optimizer.c @markshannon @Fidget-Spinner
297306
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
@@ -418,6 +427,7 @@ Lib/test/test_dataclasses/ @ericvsmith
418427

419428
# Dates and times
420429
Doc/**/*time.rst @pganssle @abalkin
430+
Doc/library/datetime-* @pganssle
421431
Doc/library/zoneinfo.rst @pganssle
422432
Include/datetime.h @pganssle @abalkin
423433
Include/internal/pycore_time.h @pganssle @abalkin
@@ -467,8 +477,9 @@ Lib/test/test_functools.py @rhettinger
467477
Modules/_functoolsmodule.c @rhettinger
468478

469479
# Garbage collector
470-
Modules/gcmodule.c @pablogsal
471-
Doc/library/gc.rst @pablogsal
480+
Modules/gcmodule.c @pablogsal
481+
Doc/library/gc.rst @pablogsal
482+
InternalDocs/garbage_collector.md @pablogsal
472483

473484
# Gettext
474485
Doc/library/gettext.rst @tomasr8

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Documentation
2+
description: Report a problem with the documentation
3+
labels: ["docs"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
> [!NOTE]
9+
> Trivial changes (for example typos) don’t require an issue before opening a PR.
10+
- type: textarea
11+
id: description
12+
attributes:
13+
label: "Documentation"
14+
description: "A clear and concise description of the issue. Include a link to the page."
15+
validations:
16+
required: true

.github/actionlint.yaml

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

65
config-variables: null
76

.github/workflows/build.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,18 @@ jobs:
242242
# BOLT currently crashes during instrumentation on aarch64
243243
- os: ubuntu-24.04-arm
244244
bolt: true
245+
include:
246+
# Enable CPU-intensive tests on ARM (default build only)
247+
- os: ubuntu-24.04-arm
248+
bolt: false
249+
free-threading: false
250+
test-opts: '-u cpu'
245251
uses: ./.github/workflows/reusable-ubuntu.yml
246252
with:
247253
bolt-optimizations: ${{ matrix.bolt }}
248254
free-threading: ${{ matrix.free-threading }}
249255
os: ${{ matrix.os }}
256+
test-opts: ${{ matrix.test-opts || '' }}
250257

251258
build-ubuntu-ssltests-openssl:
252259
name: 'Ubuntu SSL tests with OpenSSL'
@@ -261,7 +268,7 @@ jobs:
261268
# Keep 1.1.1w in our list despite it being upstream EOL and otherwise
262269
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
263270
# supported by important vendors such as AWS-LC.
264-
openssl_ver: [1.1.1w, 3.0.18, 3.3.5, 3.4.3, 3.5.4, 3.6.0]
271+
openssl_ver: [1.1.1w, 3.0.19, 3.3.6, 3.4.4, 3.5.5, 3.6.1]
265272
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
266273
env:
267274
OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -428,7 +435,7 @@ jobs:
428435
needs: build-context
429436
if: needs.build-context.outputs.run-ubuntu == 'true'
430437
env:
431-
OPENSSL_VER: 3.0.18
438+
OPENSSL_VER: 3.5.5
432439
PYTHONSTRICTEXTENSIONBUILD: 1
433440
steps:
434441
- uses: actions/checkout@v6
@@ -539,7 +546,7 @@ jobs:
539546
matrix:
540547
os: [ubuntu-24.04]
541548
env:
542-
OPENSSL_VER: 3.0.18
549+
OPENSSL_VER: 3.5.5
543550
PYTHONSTRICTEXTENSIONBUILD: 1
544551
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
545552
steps:
@@ -574,7 +581,7 @@ jobs:
574581
run: |
575582
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
576583
- name: Configure CPython
577-
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
584+
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc --with-openssl="$OPENSSL_DIR"
578585
- name: Build CPython
579586
run: make -j4
580587
- name: Display build info
@@ -655,11 +662,14 @@ jobs:
655662
matrix:
656663
sanitizer:
657664
- address
658-
- undefined
659-
- memory
660665
oss-fuzz-project-name:
661666
- cpython3
662667
- python3-libraries
668+
include:
669+
- sanitizer: undefined
670+
oss-fuzz-project-name: cpython3
671+
- sanitizer: memory
672+
oss-fuzz-project-name: cpython3
663673
exclude:
664674
# Note that the 'no-exclude' sentinel below is to prevent
665675
# an empty string value from excluding all jobs and causing

0 commit comments

Comments
 (0)