Skip to content

Commit 0fcb37a

Browse files
ZeroIntensityZeroIntensity
authored
Merge branch 'main' into clarify-reference-count
2 parents 3403bce + 0d4fd10 commit 0fcb37a

File tree

1,786 files changed

+115467
-36700
lines changed

Some content is hidden

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

1,786 files changed

+115467
-36700
lines changed

‎.azure-pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
trigger: ['main', '3.13', '3.12', '3.11', '3.10', '3.9', '3.8']
1+
trigger: ['main', '3.*']
22

33
jobs:
44
- job: Prebuild

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "ghcr.io/python/devcontainer:2024.09.25.11038928730",
2+
"image": "ghcr.io/python/devcontainer:2025.05.29.15334414373",
33
"onCreateCommand": [
44
// Install common tooling.
55
"dnf",

‎.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
root = true
22

3-
[*.{py,c,cpp,h,js,rst,md,yml}]
3+
[*.{py,c,cpp,h,js,rst,md,yml,yaml}]
44
trim_trailing_whitespace = true
55
insert_final_newline = true
66
indent_style = space
@@ -11,5 +11,5 @@ indent_size = 4
1111
[*.rst]
1212
indent_size = 3
1313

14-
[*.{js,yml}]
14+
[*.{js,yml,yaml}]
1515
indent_size = 2

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*.ico binary
1111
*.jpg binary
1212
*.pck binary
13+
*.pdf binary
1314
*.png binary
1415
*.psd binary
1516
*.tar binary
@@ -67,6 +68,7 @@ PCbuild/readme.txt dos
6768
**/clinic/*.cpp.h generated
6869
**/clinic/*.h.h generated
6970
*_db.h generated
71+
Doc/c-api/lifecycle.dot.svg generated
7072
Doc/data/stable_abi.dat generated
7173
Doc/library/token-list.inc generated
7274
Include/internal/pycore_ast.h generated

‎.github/CODEOWNERS

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@ Modules/Setup* @erlend-aasland
2626
**/*context* @1st1
2727
**/*genobject* @markshannon
2828
**/*hamt* @1st1
29-
**/*jit* @brandtbucher @savannahostrowski
29+
**/*jit* @brandtbucher @savannahostrowski @diegorusso
30+
Python/perf_jit_trampoline.c # Exclude the owners of "**/*jit*", above.
3031
Objects/set* @rhettinger
3132
Objects/dict* @methane @markshannon
3233
Objects/typevarobject.c @JelleZijlstra
34+
Objects/unionobject.c @JelleZijlstra
3335
Objects/type* @markshannon
3436
Objects/codeobject.c @markshannon
3537
Objects/frameobject.c @markshannon
3638
Objects/call.c @markshannon
39+
Objects/object.c @ZeroIntensity
3740
Python/ceval*.c @markshannon
3841
Python/ceval*.h @markshannon
3942
Python/codegen.c @markshannon @iritkatriel
@@ -43,8 +46,9 @@ Python/flowgraph.c @markshannon @iritkatriel
4346
Python/instruction_sequence.c @iritkatriel
4447
Python/bytecodes.c @markshannon
4548
Python/optimizer*.c @markshannon
46-
Python/optimizer_analysis.c @Fidget-Spinner
47-
Python/optimizer_bytecodes.c @Fidget-Spinner
49+
Python/optimizer_analysis.c @Fidget-Spinner @tomasr8
50+
Python/optimizer_bytecodes.c @Fidget-Spinner @tomasr8
51+
Python/optimizer_symbols.c @tomasr8
4852
Python/symtable.c @JelleZijlstra @carljm
4953
Lib/_pyrepl/* @pablogsal @lysnikolaou @ambv
5054
Lib/test/test_patma.py @brandtbucher
@@ -65,8 +69,8 @@ Doc/_static/** @AA-Turner @hugovk
6569
Doc/tools/** @AA-Turner @hugovk
6670

6771
# runtime state/lifecycle
68-
**/*pylifecycle* @ericsnowcurrently
69-
**/*pystate* @ericsnowcurrently
72+
**/*pylifecycle* @ericsnowcurrently @ZeroIntensity
73+
**/*pystate* @ericsnowcurrently @ZeroIntensity
7074
**/*preconfig* @ericsnowcurrently
7175
**/*initconfig* @ericsnowcurrently
7276
**/*pathconfig* @ericsnowcurrently
@@ -167,6 +171,9 @@ Include/internal/pycore_time.h @pganssle @abalkin
167171
**/*imap* @python/email-team
168172
**/*poplib* @python/email-team
169173

174+
# Exclude .mailmap from being owned by @python/email-team
175+
/.mailmap
176+
170177
# Garbage collector
171178
/Modules/gcmodule.c @pablogsal
172179
/Doc/library/gc.rst @pablogsal
@@ -183,13 +190,13 @@ Include/internal/pycore_time.h @pganssle @abalkin
183190
/Tools/cases_generator/ @markshannon
184191

185192
# AST
186-
Python/ast.c @isidentical @JelleZijlstra @eclips4
187-
Python/ast_opt.c @isidentical @eclips4
188-
Parser/asdl.py @isidentical @JelleZijlstra @eclips4
189-
Parser/asdl_c.py @isidentical @JelleZijlstra @eclips4
190-
Lib/ast.py @isidentical @JelleZijlstra @eclips4
191-
Lib/_ast_unparse.py @isidentical @JelleZijlstra @eclips4
192-
Lib/test/test_ast/ @eclips4
193+
Python/ast.c @isidentical @JelleZijlstra @eclips4 @tomasr8
194+
Python/ast_preprocess.c @isidentical @eclips4 @tomasr8
195+
Parser/asdl.py @isidentical @JelleZijlstra @eclips4 @tomasr8
196+
Parser/asdl_c.py @isidentical @JelleZijlstra @eclips4 @tomasr8
197+
Lib/ast.py @isidentical @JelleZijlstra @eclips4 @tomasr8
198+
Lib/_ast_unparse.py @isidentical @JelleZijlstra @eclips4 @tomasr8
199+
Lib/test/test_ast/ @eclips4 @tomasr8
193200

194201
# Mock
195202
/Lib/unittest/mock.py @cjw296
@@ -277,9 +284,13 @@ Doc/howto/clinic.rst @erlend-aasland
277284
# Subinterpreters
278285
**/*interpreteridobject.* @ericsnowcurrently
279286
**/*crossinterp* @ericsnowcurrently
280-
Lib/test/support/interpreters/ @ericsnowcurrently
281287
Modules/_interp*module.c @ericsnowcurrently
288+
Lib/test/test__interp*.py @ericsnowcurrently
289+
Lib/concurrent/interpreters/ @ericsnowcurrently
290+
Lib/test/support/channels.py @ericsnowcurrently
291+
Doc/library/concurrent.interpreters.rst @ericsnowcurrently
282292
Lib/test/test_interpreters/ @ericsnowcurrently
293+
Lib/concurrent/futures/interpreter.py @ericsnowcurrently
283294

284295
# Android
285296
**/*Android* @mhsmith @freakboy3742
@@ -294,7 +305,12 @@ Lib/test/test_interpreters/ @ericsnowcurrently
294305
**/*-ios* @freakboy3742
295306

296307
# WebAssembly
297-
/Tools/wasm/ @brettcannon @freakboy3742
308+
Tools/wasm/config.site-wasm32-emscripten @freakboy3742
309+
/Tools/wasm/README.md @brettcannon @freakboy3742
310+
/Tools/wasm/wasi-env @brettcannon
311+
/Tools/wasm/wasi.py @brettcannon
312+
/Tools/wasm/emscripten @freakboy3742
313+
/Tools/wasm/wasi @brettcannon
298314

299315
# SBOM
300316
/Misc/externals.spdx.json @sethmlarson
@@ -316,3 +332,17 @@ Lib/test/test__colorize.py @hugovk
316332

317333
# Fuzzing
318334
Modules/_xxtestfuzz/ @ammaraskar
335+
336+
# t-strings
337+
**/*interpolationobject* @lysnikolaou
338+
**/*templateobject* @lysnikolaou
339+
**/*templatelib* @lysnikolaou
340+
**/*tstring* @lysnikolaou
341+
342+
# Remote debugging
343+
Python/remote_debug.h @pablogsal
344+
Python/remote_debugging.c @pablogsal
345+
Modules/_remote_debugging_module.c @pablogsal @ambv @1st1
346+
347+
# gettext
348+
**/*gettext* @tomasr8

‎.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ body:
4040
- "3.12"
4141
- "3.13"
4242
- "3.14"
43+
- "3.15"
4344
- "CPython main branch"
4445
validations:
4546
required: true

‎.github/ISSUE_TEMPLATE/crash.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ body:
3333
- "3.12"
3434
- "3.13"
3535
- "3.14"
36+
- "3.15"
3637
- "CPython main branch"
3738
validations:
3839
required: true

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Please read this comment in its entirety. It's quite important.
77
It should be in the following format:
88
99
```
10-
gh-NNNNN: Summary of the changes made
10+
gh-NNNNNN: Summary of the changes made
1111
```
1212
13-
Where: gh-NNNNN refers to the GitHub issue number.
13+
Where: gh-NNNNNN refers to the GitHub issue number.
1414
1515
Most PRs will require an issue number. Trivial changes, like fixing a typo, do not need an issue.
1616
@@ -20,11 +20,11 @@ If this is a backport PR (PR made against branches other than `main`),
2020
please ensure that the PR title is in the following format:
2121
2222
```
23-
[X.Y] <title from the original PR> (GH-NNNN)
23+
[X.Y] <title from the original PR> (GH-NNNNNN)
2424
```
2525
26-
Where: [X.Y] is the branch name, e.g. [3.6].
26+
Where: [X.Y] is the branch name, for example: [3.13].
2727
28-
GH-NNNN refers to the PR number from `main`.
28+
GH-NNNNNN refers to the PR number from `main`.
2929
3030
-->

‎.github/actionlint.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
self-hosted-runner:
2-
labels: ["windows-aarch64"]
2+
# Pending https://github.com/rhysd/actionlint/issues/533
3+
labels: ["windows-11-arm"]
34

45
config-variables: null
56

0 commit comments

Comments
 (0)