Skip to content

Commit 6c5cec5

Browse files
authored
Merge branch 'main' into gh-117657-tsan-pymember-c-ext
2 parents c1b4c35 + bfb0788 commit 6c5cec5

File tree

1,976 files changed

+118771
-71785
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,976 files changed

+118771
-71785
lines changed

.azure-pipelines/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
displayName: Pre-build checks
66

77
pool:
8-
vmImage: ubuntu-22.04
8+
vmImage: ubuntu-24.04
99

1010
steps:
1111
- template: ./prebuild-checks.yml

.devcontainer/Dockerfile

-24
This file was deleted.

.devcontainer/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"build": {
3-
"dockerfile": "Dockerfile"
4-
},
2+
"image": "ghcr.io/python/devcontainer:2024.09.25.11038928730",
53
"onCreateCommand": [
64
// Install common tooling.
75
"dnf",

.gitattributes

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Lib/test/cjkencodings/* noeol
2727
Lib/test/tokenizedata/coding20731.py noeol
2828
Lib/test/decimaltestdata/*.decTest noeol
2929
Lib/test/test_email/data/*.txt noeol
30-
Lib/test/test_importlib/resources/data01/* noeol
31-
Lib/test/test_importlib/resources/namespacedata01/* noeol
3230
Lib/test/xmltestdata/* noeol
3331

3432
# Shell scripts should have LF even on Windows because of Cygwin

.github/CODEOWNERS

+34-14
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@ configure* @erlend-aasland @corona10
1616
Makefile.pre.in @erlend-aasland
1717
Modules/Setup* @erlend-aasland
1818

19+
# argparse
20+
**/*argparse* @savannahostrowski
21+
1922
# asyncio
20-
**/*asyncio* @1st1 @asvetlov @gvanrossum @kumaraditya303 @willingc
23+
**/*asyncio* @1st1 @asvetlov @kumaraditya303 @willingc
2124

2225
# Core
2326
**/*context* @1st1
2427
**/*genobject* @markshannon
2528
**/*hamt* @1st1
26-
**/*jit* @brandtbucher
29+
**/*jit* @brandtbucher @savannahostrowski
2730
Objects/set* @rhettinger
2831
Objects/dict* @methane @markshannon
2932
Objects/typevarobject.c @JelleZijlstra
@@ -33,11 +36,11 @@ Objects/frameobject.c @markshannon
3336
Objects/call.c @markshannon
3437
Python/ceval*.c @markshannon
3538
Python/ceval*.h @markshannon
39+
Python/codegen.c @markshannon @iritkatriel
3640
Python/compile.c @markshannon @iritkatriel
3741
Python/assemble.c @markshannon @iritkatriel
3842
Python/flowgraph.c @markshannon @iritkatriel
3943
Python/instruction_sequence.c @iritkatriel
40-
Python/ast_opt.c @isidentical
4144
Python/bytecodes.c @markshannon
4245
Python/optimizer*.c @markshannon
4346
Python/optimizer_analysis.c @Fidget-Spinner
@@ -78,6 +81,17 @@ Programs/_bootstrap_python.c @ericsnowcurrently
7881
Programs/python.c @ericsnowcurrently
7982
Tools/build/generate_global_objects.py @ericsnowcurrently
8083

84+
# Initialization
85+
Doc/library/sys_path_init.rst @FFY00
86+
Doc/c-api/init_config.rst @FFY00
87+
88+
# getpath
89+
**/*getpath* @FFY00
90+
91+
# site
92+
**/*site.py @FFY00
93+
Doc/library/site.rst @FFY00
94+
8195
# Exceptions
8296
Lib/test/test_except*.py @iritkatriel
8397
Objects/exceptions.c @iritkatriel
@@ -88,14 +102,13 @@ Objects/exceptions.c @iritkatriel
88102
**/sha* @gpshead @tiran
89103
Modules/md5* @gpshead @tiran
90104
**/*blake* @gpshead @tiran
91-
Modules/_blake2/** @gpshead @tiran
92105
Modules/_hacl/** @gpshead
93106

94107
# logging
95108
**/*logging* @vsajip
96109

97110
# venv
98-
**/*venv* @vsajip
111+
**/*venv* @vsajip @FFY00
99112

100113
# Launcher
101114
/PC/launcher.c @vsajip
@@ -157,10 +170,12 @@ Include/internal/pycore_time.h @pganssle @abalkin
157170
/Tools/cases_generator/ @markshannon
158171

159172
# AST
160-
Python/ast.c @isidentical @JelleZijlstra
161-
Parser/asdl.py @isidentical @JelleZijlstra
162-
Parser/asdl_c.py @isidentical @JelleZijlstra
163-
Lib/ast.py @isidentical @JelleZijlstra
173+
Python/ast.c @isidentical @JelleZijlstra @eclips4
174+
Python/ast_opt.c @isidentical @eclips4
175+
Parser/asdl.py @isidentical @JelleZijlstra @eclips4
176+
Parser/asdl_c.py @isidentical @JelleZijlstra @eclips4
177+
Lib/ast.py @isidentical @JelleZijlstra @eclips4
178+
Lib/test/test_ast/ @eclips4
164179

165180
# Mock
166181
/Lib/unittest/mock.py @cjw296
@@ -205,14 +220,14 @@ Doc/c-api/stable.rst @encukou
205220
**/*bisect* @rhettinger
206221
**/*heapq* @rhettinger
207222
**/*functools* @rhettinger
208-
**/*decimal* @rhettinger
209223

210224
**/*dataclasses* @ericvsmith
211225

212226
**/*ensurepip* @pfmoore @pradyunsg
213227

214-
**/*idlelib* @terryjreedy
215228
/Doc/library/idle.rst @terryjreedy
229+
**/*idlelib* @terryjreedy
230+
**/*turtledemo* @terryjreedy
216231

217232
**/*annotationlib* @JelleZijlstra
218233
**/*typing* @JelleZijlstra @AlexWaygood
@@ -253,8 +268,8 @@ Modules/_interp*module.c @ericsnowcurrently
253268
Lib/test/test_interpreters/ @ericsnowcurrently
254269

255270
# Android
256-
**/*Android* @mhsmith
257-
**/*android* @mhsmith
271+
**/*Android* @mhsmith @freakboy3742
272+
**/*android* @mhsmith @freakboy3742
258273

259274
# iOS (but not termios)
260275
**/iOS* @freakboy3742
@@ -265,7 +280,7 @@ Lib/test/test_interpreters/ @ericsnowcurrently
265280
**/*-ios* @freakboy3742
266281

267282
# WebAssembly
268-
/Tools/wasm/ @brettcannon
283+
/Tools/wasm/ @brettcannon @freakboy3742
269284

270285
# SBOM
271286
/Misc/externals.spdx.json @sethmlarson
@@ -275,3 +290,8 @@ Lib/test/test_interpreters/ @ericsnowcurrently
275290
# Config Parser
276291
Lib/configparser.py @jaraco
277292
Lib/test/test_configparser.py @jaraco
293+
294+
# Doc sections
295+
Doc/reference/ @willingc
296+
297+
**/*weakref* @kumaraditya303

.github/ISSUE_TEMPLATE/bug.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ body:
3434
label: "CPython versions tested on:"
3535
multiple: true
3636
options:
37-
- "3.8"
3837
- "3.9"
3938
- "3.10"
4039
- "3.11"
4140
- "3.12"
4241
- "3.13"
42+
- "3.14"
4343
- "CPython main branch"
4444
validations:
4545
required: true

.github/ISSUE_TEMPLATE/crash.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ body:
2727
label: "CPython versions tested on:"
2828
multiple: true
2929
options:
30-
- "3.8"
3130
- "3.9"
3231
- "3.10"
3332
- "3.11"
3433
- "3.12"
34+
- "3.13"
35+
- "3.14"
3536
- "CPython main branch"
3637
validations:
3738
required: true

.github/actionlint.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
self-hosted-runner:
2+
labels: ["ubuntu-24.04-aarch64", "windows-aarch64"]
3+
4+
config-variables: null
5+
6+
paths:
7+
.github/workflows/**/*.yml:
8+
ignore:
9+
- 1st argument of function call is not assignable
10+
- SC2(015|038|086|091|097|098|129|155)

0 commit comments

Comments
 (0)