Skip to content

Commit f0eeaa3

Browse files
authored
Merge branch 'main' into spawn-process-sideeffect
2 parents 980ba92 + c4ab024 commit f0eeaa3

File tree

2,020 files changed

+197435
-67787
lines changed

Some content is hidden

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

2,020 files changed

+197435
-67787
lines changed
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"image": "ghcr.io/python/wasicontainer:latest",
3+
"onCreateCommand": [
4+
// Install common tooling.
5+
"dnf",
6+
"install",
7+
"-y",
8+
// For umask fix below.
9+
"/usr/bin/setfacl"
10+
],
11+
"updateContentCommand": {
12+
// Using the shell for `nproc` usage.
13+
"python": "python3 Tools/wasm/wasi build --quiet -- --with-pydebug -C"
14+
},
15+
"postCreateCommand": {
16+
// https://github.com/orgs/community/discussions/26026
17+
"umask fix: workspace": ["sudo", "setfacl", "-bnR", "."],
18+
"umask fix: /tmp": ["sudo", "setfacl", "-bnR", "/tmp"]
19+
},
20+
"customizations": {
21+
"vscode": {
22+
"extensions": [
23+
// Highlighting for Parser/Python.asdl.
24+
"brettcannon.zephyr-asdl",
25+
// Highlighting for configure.ac.
26+
"maelvalais.autoconf",
27+
// C auto-complete.
28+
"ms-vscode.cpptools",
29+
// Python auto-complete.
30+
"ms-python.python"
31+
],
32+
"settings": {
33+
"C_Cpp.default.compilerPath": "/usr/bin/clang",
34+
"C_Cpp.default.cStandard": "c11",
35+
"C_Cpp.default.defines": [
36+
"CONFIG_64",
37+
"Py_BUILD_CORE"
38+
],
39+
"C_Cpp.default.includePath": [
40+
"${workspaceFolder}/*",
41+
"${workspaceFolder}/Include/**"
42+
],
43+
// https://github.com/microsoft/vscode-cpptools/issues/10732
44+
"C_Cpp.errorSquiggles": "disabled",
45+
"editor.insertSpaces": true,
46+
"editor.rulers": [
47+
80
48+
],
49+
"editor.tabSize": 4,
50+
"editor.trimAutoWhitespace": true,
51+
"files.associations": {
52+
"*.h": "c"
53+
},
54+
"files.encoding": "utf8",
55+
"files.eol": "\n",
56+
"files.insertFinalNewline": true,
57+
"files.trimTrailingWhitespace": true,
58+
"python.analysis.diagnosticSeverityOverrides": {
59+
// Complains about shadowing the stdlib w/ the stdlib.
60+
"reportShadowedImports": "none",
61+
// Doesn't like _frozen_importlib.
62+
"reportMissingImports": "none"
63+
},
64+
"python.analysis.extraPaths": [
65+
"Lib"
66+
],
67+
"[restructuredtext]": {
68+
"editor.tabSize": 3
69+
}
70+
}
71+
}
72+
}
73+
}

.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ PCbuild/readme.txt dos
6868
**/clinic/*.cpp.h generated
6969
**/clinic/*.h.h generated
7070
*_db.h generated
71+
Doc/_static/tachyon-example-*.html generated
7172
Doc/c-api/lifecycle.dot.svg generated
7273
Doc/data/stable_abi.dat generated
7374
Doc/library/token-list.inc generated
@@ -82,11 +83,15 @@ Include/opcode.h generated
8283
Include/opcode_ids.h generated
8384
Include/token.h generated
8485
Lib/_opcode_metadata.py generated
86+
Lib/idlelib/help.html generated
8587
Lib/keyword.py generated
88+
Lib/pydoc_data/topics.py generated
89+
Lib/pydoc_data/module_docs.py generated
8690
Lib/test/certdata/*.pem generated
8791
Lib/test/certdata/*.0 generated
8892
Lib/test/levenshtein_examples.json generated
8993
Lib/test/test_stable_abi_ctypes.py generated
94+
Lib/test/test_zoneinfo/data/*.json generated
9095
Lib/token.py generated
9196
Misc/sbom.spdx.json generated
9297
Objects/typeslots.inc generated
@@ -103,3 +108,4 @@ Python/stdlib_module_names.h generated
103108
Tools/peg_generator/pegen/grammar_parser.py generated
104109
aclocal.m4 generated
105110
configure generated
111+
*.min.js generated

.github/CODEOWNERS

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,16 @@ Tools/patchcheck/ @AA-Turner
8080
# ----------------------------------------------------------------------------
8181

8282
# Autotools
83-
configure* @erlend-aasland @corona10 @AA-Turner
84-
Makefile.pre.in @erlend-aasland @AA-Turner
85-
Modules/Setup* @erlend-aasland @AA-Turner
83+
configure* @erlend-aasland @corona10 @AA-Turner @emmatyping
84+
Makefile.pre.in @erlend-aasland @AA-Turner @emmatyping
85+
Modules/makesetup @erlend-aasland @AA-Turner @emmatyping
86+
Modules/Setup* @erlend-aasland @AA-Turner @emmatyping
8687
Tools/build/regen-configure.sh @AA-Turner
8788

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

8994
# ----------------------------------------------------------------------------
9095
# Documentation
@@ -121,6 +126,9 @@ Doc/howto/clinic.rst @erlend-aasland @AA-Turner
121126
# C Analyser
122127
Tools/c-analyzer/ @ericsnowcurrently
123128

129+
# C API Documentation Checks
130+
Tools/check-c-api-docs/ @ZeroIntensity
131+
124132
# Fuzzing
125133
Modules/_xxtestfuzz/ @ammaraskar
126134

@@ -149,6 +157,7 @@ Lib/test/test_android.py @mhsmith @freakboy3742
149157
# iOS
150158
Doc/using/ios.rst @freakboy3742
151159
Lib/_ios_support.py @freakboy3742
160+
Apple/ @freakboy3742
152161
iOS/ @freakboy3742
153162

154163
# macOS
@@ -157,16 +166,16 @@ Lib/_osx_support.py @python/macos-team
157166
Lib/test/test__osx_support.py @python/macos-team
158167

159168
# WebAssembly
160-
Tools/wasm/README.md @brettcannon @freakboy3742
169+
Tools/wasm/README.md @brettcannon @freakboy3742 @emmatyping
161170

162171
# WebAssembly (Emscripten)
163-
Tools/wasm/config.site-wasm32-emscripten @freakboy3742
164-
Tools/wasm/emscripten @freakboy3742
172+
Tools/wasm/config.site-wasm32-emscripten @freakboy3742 @emmatyping
173+
Tools/wasm/emscripten @freakboy3742 @emmatyping
165174

166175
# WebAssembly (WASI)
167-
Tools/wasm/wasi-env @brettcannon
168-
Tools/wasm/wasi.py @brettcannon
169-
Tools/wasm/wasi @brettcannon
176+
Tools/wasm/wasi-env @brettcannon @emmatyping
177+
Tools/wasm/wasi.py @brettcannon @emmatyping
178+
Tools/wasm/wasi @brettcannon @emmatyping
170179

171180
# Windows
172181
PC/ @python/windows-team
@@ -239,10 +248,10 @@ Lib/test/test_getpath.py @FFY00
239248
Modules/getpath* @FFY00
240249

241250
# Hashing / ``hash()`` and related
242-
Include/cpython/pyhash.h @gpshead @picnixz @tiran
243-
Include/internal/pycore_pyhash.h @gpshead @picnixz @tiran
244-
Include/pyhash.h @gpshead @picnixz @tiran
245-
Python/pyhash.c @gpshead @picnixz @tiran
251+
Include/cpython/pyhash.h @gpshead @picnixz
252+
Include/internal/pycore_pyhash.h @gpshead @picnixz
253+
Include/pyhash.h @gpshead @picnixz
254+
Python/pyhash.c @gpshead @picnixz
246255

247256
# The import system (including importlib)
248257
**/*import* @brettcannon @ericsnowcurrently @ncoghlan @warsaw
@@ -280,10 +289,10 @@ Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
280289
InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-Turner
281290

282291
# Micro-op / μop / Tier 2 Optimiser
283-
Python/optimizer.c @markshannon
292+
Python/optimizer.c @markshannon @Fidget-Spinner
284293
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner
285294
Python/optimizer_bytecodes.c @markshannon @tomasr8 @Fidget-Spinner
286-
Python/optimizer_symbols.c @markshannon @tomasr8
295+
Python/optimizer_symbols.c @markshannon @tomasr8 @Fidget-Spinner
287296

288297
# Parser, Lexer, and Grammar
289298
Grammar/python.gram @pablogsal @lysnikolaou
@@ -313,7 +322,7 @@ Tools/build/generate_global_objects.py @ericsnowcurrently
313322
# Remote Debugging
314323
Python/remote_debug.h @pablogsal
315324
Python/remote_debugging.c @pablogsal
316-
Modules/_remote_debugging_module.c @pablogsal @ambv @1st1
325+
Modules/_remote_debugging/ @pablogsal
317326

318327
# Sub-Interpreters
319328
**/*crossinterp* @ericsnowcurrently
@@ -369,14 +378,14 @@ Lib/calendar.py @AA-Turner
369378
Lib/test/test_calendar.py @AA-Turner
370379

371380
# Cryptographic Primitives and Applications
372-
**/*hashlib* @gpshead @picnixz @tiran
373-
**/*hashopenssl* @gpshead @picnixz @tiran
381+
**/*hashlib* @gpshead @picnixz
382+
**/*hashopenssl* @gpshead @picnixz
374383
**/*hmac* @gpshead @picnixz
375384
**/*ssl* @gpshead @picnixz
376385
Modules/_hacl/ @gpshead @picnixz
377-
Modules/*blake* @gpshead @picnixz @tiran
378-
Modules/*md5* @gpshead @picnixz @tiran
379-
Modules/*sha* @gpshead @picnixz @tiran
386+
Modules/*blake* @gpshead @picnixz
387+
Modules/*md5* @gpshead @picnixz
388+
Modules/*sha* @gpshead @picnixz
380389

381390
# Codecs
382391
Modules/cjkcodecs/ @corona10
@@ -405,11 +414,15 @@ Lib/test/test_dataclasses/ @ericvsmith
405414

406415
# Dates and times
407416
Doc/**/*time.rst @pganssle @abalkin
417+
Doc/library/zoneinfo.rst @pganssle
408418
Include/datetime.h @pganssle @abalkin
409419
Include/internal/pycore_time.h @pganssle @abalkin
420+
Lib/test/test_zoneinfo/ @pganssle
421+
Lib/zoneinfo/ @pganssle
410422
Lib/*time.py @pganssle @abalkin
411423
Lib/test/datetimetester.py @pganssle @abalkin
412424
Lib/test/test_*time.py @pganssle @abalkin
425+
Modules/*zoneinfo* @pganssle
413426
Modules/*time* @pganssle @abalkin
414427
Python/pytime.c @pganssle @abalkin
415428

@@ -524,6 +537,11 @@ Lib/pydoc.py @AA-Turner
524537
Lib/pydoc_data/ @AA-Turner
525538
Lib/test/test_pydoc/ @AA-Turner
526539

540+
# Profiling (Sampling)
541+
Doc/library/profiling*.rst @pablogsal
542+
Lib/profiling/ @pablogsal
543+
Lib/test/test_profiling/ @pablogsal
544+
527545
# PyREPL
528546
Lib/_pyrepl/ @pablogsal @lysnikolaou @ambv
529547
Lib/test/test_pyrepl/ @pablogsal @lysnikolaou @ambv
@@ -603,9 +621,9 @@ Lib/test/test_zipfile/_path/ @jaraco
603621
Lib/zipfile/_path/ @jaraco
604622

605623
# Zstandard
606-
Lib/compression/zstd/ @AA-Turner
607-
Lib/test/test_zstd.py @AA-Turner
608-
Modules/_zstd/ @AA-Turner
624+
Lib/compression/zstd/ @AA-Turner @emmatyping
625+
Lib/test/test_zstd.py @AA-Turner @emmatyping
626+
Modules/_zstd/ @AA-Turner @emmatyping
609627

610628
# ----------------------------------------------------------------------------
611629

.github/CONTRIBUTING.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@ Please be aware that our workflow does deviate slightly from the typical GitHub
2828
project. Details on how to properly submit a pull request are covered in
2929
`Lifecycle of a Pull Request <https://devguide.python.org/getting-started/pull-request-lifecycle.html>`_.
3030
We utilize various bots and status checks to help with this, so do follow the
31-
comments they leave and their "Details" links, respectively. The key points of
32-
our workflow that are not covered by a bot or status check are:
31+
comments they leave and their "Details" links, respectively.
3332

34-
- All discussions that are not directly related to the code in the pull request
35-
should happen on `GitHub Issues <https://github.com/python/cpython/issues>`_.
36-
- Upon your first non-trivial pull request (which includes documentation changes),
37-
feel free to add yourself to ``Misc/ACKS``
33+
The final key part of our workflow is that all discussions that are not
34+
directly related to the code in the pull request should happen on
35+
`GitHub Issues <https://github.com/python/cpython/issues>`__, generally in the
36+
pull request's parent issue.
3837

3938

4039
Setting Expectations
4140
--------------------
42-
Due to the fact that this project is entirely volunteer-run (i.e. no one is paid
43-
to work on Python full-time), we unfortunately can make no guarantees as to if
41+
Due to the fact that this project is run by volunteers,
42+
unfortunately we cannot make any guarantees as to if
4443
or when a core developer will get around to reviewing your pull request.
4544
If no core developer has done a review or responded to changes made because of a
46-
"changes requested" review, please feel free to email python-dev to ask if
47-
someone could take a look at your pull request.
45+
"changes requested" review within a month, you can ask for someone to
46+
review your pull request via a post in the `Core Development Discourse
47+
category <https://discuss.python.org/c/core-dev/23>`__.
4848

4949

5050
Code of Conduct

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ contact_links:
55
- name: "Proposing new features"
66
about: "Submit major feature proposal (e.g. syntax changes) to an ideas forum first."
77
url: "https://discuss.python.org/c/ideas/6"
8+
- name: "Python Install Manager issues"
9+
about: "Report issues with the Python Install Manager (for Windows)"
10+
url: "https://github.com/python/pymanager/issues"

.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/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,17 @@ updates:
1212
update-types:
1313
- "version-update:semver-minor"
1414
- "version-update:semver-patch"
15+
cooldown:
16+
# https://blog.yossarian.net/2025/11/21/We-should-all-be-using-dependency-cooldowns
17+
# Cooldowns protect against supply chain attacks by avoiding the
18+
# highest-risk window immediately after new releases.
19+
default-days: 14
1520
- package-ecosystem: "pip"
1621
directory: "/Tools/"
1722
schedule:
1823
interval: "monthly"
1924
labels:
2025
- "skip issue"
2126
- "skip news"
27+
cooldown:
28+
default-days: 14

0 commit comments

Comments
 (0)