Skip to content

Commit 3314ccd

Browse files
cdce8pcdce8p
committed
Merge branch 'main'
2 parents 64692e6 + 41b9ad5 commit 3314ccd

File tree

1,664 files changed

+69727
-28876
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,664 files changed

+69727
-28876
lines changed

‎.devcontainer/wasi/devcontainer.json‎

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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Include/opcode_ids.h generated
8383
Include/token.h generated
8484
Lib/_opcode_metadata.py generated
8585
Lib/keyword.py generated
86+
Lib/idlelib/help.html generated
8687
Lib/test/certdata/*.pem generated
8788
Lib/test/certdata/*.0 generated
8889
Lib/test/levenshtein_examples.json generated

‎.github/CODEOWNERS‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,14 @@ Tools/patchcheck/ @AA-Turner
8282
# Autotools
8383
configure* @erlend-aasland @corona10 @AA-Turner @emmatyping
8484
Makefile.pre.in @erlend-aasland @AA-Turner @emmatyping
85+
Modules/makesetup @erlend-aasland @AA-Turner @emmatyping
8586
Modules/Setup* @erlend-aasland @AA-Turner @emmatyping
86-
Modules/makesetup @emmatyping
8787
Tools/build/regen-configure.sh @AA-Turner
8888

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

9094
# ----------------------------------------------------------------------------
9195
# Documentation
@@ -150,6 +154,7 @@ Lib/test/test_android.py @mhsmith @freakboy3742
150154
# iOS
151155
Doc/using/ios.rst @freakboy3742
152156
Lib/_ios_support.py @freakboy3742
157+
Apple/ @freakboy3742
153158
iOS/ @freakboy3742
154159

155160
# macOS
@@ -240,10 +245,10 @@ Lib/test/test_getpath.py @FFY00
240245
Modules/getpath* @FFY00
241246

242247
# Hashing / ``hash()`` and related
243-
Include/cpython/pyhash.h @gpshead @picnixz @tiran
244-
Include/internal/pycore_pyhash.h @gpshead @picnixz @tiran
245-
Include/pyhash.h @gpshead @picnixz @tiran
246-
Python/pyhash.c @gpshead @picnixz @tiran
248+
Include/cpython/pyhash.h @gpshead @picnixz
249+
Include/internal/pycore_pyhash.h @gpshead @picnixz
250+
Include/pyhash.h @gpshead @picnixz
251+
Python/pyhash.c @gpshead @picnixz
247252

248253
# The import system (including importlib)
249254
**/*import* @brettcannon @ericsnowcurrently @ncoghlan @warsaw
@@ -370,14 +375,14 @@ Lib/calendar.py @AA-Turner
370375
Lib/test/test_calendar.py @AA-Turner
371376

372377
# Cryptographic Primitives and Applications
373-
**/*hashlib* @gpshead @picnixz @tiran
374-
**/*hashopenssl* @gpshead @picnixz @tiran
378+
**/*hashlib* @gpshead @picnixz
379+
**/*hashopenssl* @gpshead @picnixz
375380
**/*hmac* @gpshead @picnixz
376381
**/*ssl* @gpshead @picnixz
377382
Modules/_hacl/ @gpshead @picnixz
378-
Modules/*blake* @gpshead @picnixz @tiran
379-
Modules/*md5* @gpshead @picnixz @tiran
380-
Modules/*sha* @gpshead @picnixz @tiran
383+
Modules/*blake* @gpshead @picnixz
384+
Modules/*md5* @gpshead @picnixz
385+
Modules/*sha* @gpshead @picnixz
381386

382387
# Codecs
383388
Modules/cjkcodecs/ @corona10
@@ -406,11 +411,15 @@ Lib/test/test_dataclasses/ @ericvsmith
406411

407412
# Dates and times
408413
Doc/**/*time.rst @pganssle @abalkin
414+
Doc/library/zoneinfo.rst @pganssle
409415
Include/datetime.h @pganssle @abalkin
410416
Include/internal/pycore_time.h @pganssle @abalkin
417+
Lib/test/test_zoneinfo/ @pganssle
418+
Lib/zoneinfo/ @pganssle
411419
Lib/*time.py @pganssle @abalkin
412420
Lib/test/datetimetester.py @pganssle @abalkin
413421
Lib/test/test_*time.py @pganssle @abalkin
422+
Modules/*zoneinfo* @pganssle
414423
Modules/*time* @pganssle @abalkin
415424
Python/pytime.c @pganssle @abalkin
416425

‎.github/CONTRIBUTING.rst‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,18 @@ our workflow that are not covered by a bot or status check are:
3434
- All discussions that are not directly related to the code in the pull request
3535
should happen on `GitHub Issues <https://github.com/python/cpython/issues>`_.
3636
- Upon your first non-trivial pull request (which includes documentation changes),
37-
feel free to add yourself to ``Misc/ACKS``
37+
feel free to add yourself to ``Misc/ACKS``.
3838

3939

4040
Setting Expectations
4141
--------------------
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
42+
Due to the fact that this project is run by volunteers,
43+
unfortunately we cannot make any guarantees as to if
4444
or when a core developer will get around to reviewing your pull request.
4545
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.
46+
"changes requested" review within a month, you can ask for someone to
47+
review your pull request via a post in the `Core Development Discourse
48+
category <https://discuss.python.org/c/core-dev/23>`__.
4849

4950

5051
Code of Conduct

‎.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

0 commit comments

Comments
 (0)