Skip to content

Commit e18626c

Browse files
FFY00FFY00
authored
Merge branch 'main' into pythongh-103247-_require_loader
2 parents 8be54d3 + a071ecb commit e18626c

2,273 files changed

Lines changed: 133068 additions & 134726 deletions

File tree

Some content is hidden

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

‎.azure-pipelines/ci.yml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,6 @@ jobs:
1414
- template: ./prebuild-checks.yml
1515

1616

17-
- job: Docs_PR
18-
displayName: Docs PR
19-
dependsOn: Prebuild
20-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
21-
22-
pool:
23-
vmImage: ubuntu-22.04
24-
25-
steps:
26-
- template: ./docs-steps.yml
27-
parameters:
28-
upload: true
29-
30-
3117
- job: macOS_CI_Tests
3218
displayName: macOS CI Tests
3319
dependsOn: Prebuild
@@ -57,7 +43,7 @@ jobs:
5743
variables:
5844
testRunTitle: '$(build.sourceBranchName)-linux'
5945
testRunPlatform: linux
60-
openssl_version: 1.1.1t
46+
openssl_version: 1.1.1u
6147

6248
steps:
6349
- template: ./posix-steps.yml
@@ -83,7 +69,7 @@ jobs:
8369
variables:
8470
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8571
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1t
72+
openssl_version: 1.1.1u
8773

8874
steps:
8975
- template: ./posix-steps.yml

‎.azure-pipelines/docs-steps.yml‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎.azure-pipelines/pr.yml‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ jobs:
1414
- template: ./prebuild-checks.yml
1515

1616

17-
- job: Docs_PR
18-
displayName: Docs PR
19-
dependsOn: Prebuild
20-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
21-
22-
pool:
23-
vmImage: ubuntu-22.04
24-
25-
steps:
26-
- template: ./docs-steps.yml
27-
28-
2917
- job: macOS_PR_Tests
3018
displayName: macOS PR Tests
3119
dependsOn: Prebuild
@@ -57,7 +45,7 @@ jobs:
5745
variables:
5846
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5947
testRunPlatform: linux
60-
openssl_version: 1.1.1t
48+
openssl_version: 1.1.1u
6149

6250
steps:
6351
- template: ./posix-steps.yml
@@ -83,7 +71,7 @@ jobs:
8371
variables:
8472
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8573
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1t
74+
openssl_version: 1.1.1u
8775

8876
steps:
8977
- template: ./posix-steps.yml

‎.azure-pipelines/prebuild-checks.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ steps:
1111
displayName: Fetch comparison tree
1212
condition: and(succeeded(), variables['System.PullRequest.TargetBranch'])
1313

14-
- script: |
15-
if ! git diff --name-only $(diffTarget) | grep -qE '(\.rst$|^Doc|^Misc)'
16-
then
17-
echo "No docs were updated: docs.run=false"
18-
echo "##vso[task.setvariable variable=run;isOutput=true]false"
19-
else
20-
echo "Docs were updated: docs.run=true"
21-
echo "##vso[task.setvariable variable=run;isOutput=true]true"
22-
fi
23-
displayName: Detect documentation changes
24-
name: docs
25-
2614
- script: |
2715
if ! git diff --name-only $(diffTarget) | grep -qvE '(\.rst$|^Doc|^Misc)'
2816
then

‎.coveragerc‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[run]
2+
branch = True
3+
4+
[report]
5+
# Regexes for lines to exclude from consideration
6+
exclude_lines =
7+
# Don't complain if non-runnable code isn't run:
8+
if 0:
9+
if __name__ == .__main__.:
10+
raise AssertionError\(
11+
12+
# Empty bodies in protocols or abstract methods
13+
^\s*def [a-zA-Z0-9_]+\(.*\)(\s*->.*)?:\s*\.\.\.(\s*#.*)?$
14+
^\s*\.\.\.(\s*#.*)?$
15+
16+
.*# pragma: no cover
17+
.*# pragma: no branch
18+
19+
# Additions for IDLE:
20+
.*# htest #
21+
if not (_htest or _utest):
22+
if not .*_utest:
23+
if .*_htest:
24+

‎.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ FROM docker.io/library/fedora:37
22

33
ENV CC=clang
44

5-
ENV WASI_SDK_VERSION=19
5+
ENV WASI_SDK_VERSION=20
66
ENV WASI_SDK_PATH=/opt/wasi-sdk
77

88
ENV WASMTIME_HOME=/opt/wasmtime
9-
ENV WASMTIME_VERSION=7.0.0
9+
ENV WASMTIME_VERSION=9.0.1
1010
ENV WASMTIME_CPU_ARCH=x86_64
1111

1212
RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \

‎.devcontainer/devcontainer.json‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"-y",
1010
"which",
1111
"zsh",
12-
"fish"
12+
"fish",
13+
// For umask fix below.
14+
"/usr/bin/setfacl"
1315
],
1416
"updateContentCommand": {
1517
// Using the shell for `nproc` usage.
@@ -22,6 +24,11 @@
2224
"html"
2325
]
2426
},
27+
"postCreateCommand": {
28+
// https://github.com/orgs/community/discussions/26026
29+
"umask fix: workspace": ["sudo", "setfacl", "-bnR", "."],
30+
"umask fix: /tmp": ["sudo", "setfacl", "-bnR", "/tmp"]
31+
},
2532
"customizations": {
2633
"vscode": {
2734
"extensions": [
@@ -31,10 +38,10 @@
3138
"maelvalais.autoconf",
3239
// C auto-complete.
3340
"ms-vscode.cpptools",
34-
// To view built docs.
35-
"ms-vscode.live-server"
36-
// https://github.com/microsoft/vscode-python/issues/18073
37-
// "ms-python.python"
41+
// To view HTML build of docs.
42+
"ms-vscode.live-server",
43+
// Python auto-complete.
44+
"ms-python.python"
3845
],
3946
"settings": {
4047
"C_Cpp.default.compilerPath": "/usr/bin/clang",

‎.gitattributes‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*.zip binary
1919

2020
# Specific binary files
21-
Lib/test/sndhdrdata/sndhdr.* binary
2221
PC/classicAppCompat.* binary
2322

2423
# Text files that should not be subject to eol conversion
@@ -73,9 +72,12 @@ Doc/library/token-list.inc generated
7372
Include/internal/pycore_ast.h generated
7473
Include/internal/pycore_ast_state.h generated
7574
Include/internal/pycore_opcode.h generated
75+
Include/internal/pycore_opcode_metadata.h generated
7676
Include/internal/pycore_*_generated.h generated
7777
Include/opcode.h generated
78+
Include/opcode_ids.h generated
7879
Include/token.h generated
80+
Lib/_opcode_metadata.py generated
7981
Lib/keyword.py generated
8082
Lib/test/levenshtein_examples.json generated
8183
Lib/test/test_stable_abi_ctypes.py generated
@@ -86,7 +88,9 @@ Parser/parser.c generated
8688
Parser/token.c generated
8789
Programs/test_frozenmain.h generated
8890
Python/Python-ast.c generated
91+
Python/executor_cases.c.h generated
8992
Python/generated_cases.c.h generated
93+
Python/abstract_interp_cases.c.h generated
9094
Python/opcode_targets.h generated
9195
Python/stdlib_module_names.h generated
9296
Tools/peg_generator/pegen/grammar_parser.py generated

‎.github/CODEOWNERS‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# GitHub
88
.github/** @ezio-melotti @hugovk
99

10+
# pre-commit
11+
.pre-commit-config.yaml @hugovk @AlexWaygood
12+
1013
# Build system
1114
configure* @erlend-aasland @corona10
1215

@@ -19,6 +22,7 @@ configure* @erlend-aasland @corona10
1922
**/*hamt* @1st1
2023
Objects/set* @rhettinger
2124
Objects/dict* @methane @markshannon
25+
Objects/typevarobject.c @JelleZijlstra
2226
Objects/type* @markshannon
2327
Objects/codeobject.c @markshannon
2428
Objects/frameobject.c @markshannon
@@ -30,6 +34,7 @@ Python/flowgraph.c @markshannon @iritkatriel
3034
Python/ast_opt.c @isidentical
3135
Lib/test/test_patma.py @brandtbucher
3236
Lib/test/test_peepholer.py @brandtbucher
37+
Lib/test/test_type_*.py @JelleZijlstra
3338

3439
# Exceptions
3540
Lib/traceback.py @iritkatriel
@@ -63,7 +68,8 @@ Python/traceback.c @iritkatriel
6368
/Tools/build/parse_html5_entities.py @ezio-melotti
6469

6570
# Import (including importlib).
66-
**/*import* @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
71+
**/*import* @brettcannon @ericsnowcurrently @ncoghlan @warsaw
72+
/Python/import.c @kumaraditya303
6773
**/*importlib/resources/* @jaraco @warsaw @FFY00
6874
**/importlib/metadata/* @jaraco @warsaw
6975

@@ -74,7 +80,7 @@ Doc/library/time.rst @pganssle @abalkin
7480
Lib/test/test_time.py @pganssle @abalkin
7581
Modules/timemodule.c @pganssle @abalkin
7682
Python/pytime.c @pganssle @abalkin
77-
Include/pytime.h @pganssle @abalkin
83+
Include/internal/pycore_time.h @pganssle @abalkin
7884

7985
# Email and related
8086
**/*mail* @python/email-team
@@ -92,6 +98,8 @@ Include/pytime.h @pganssle @abalkin
9298
/Tools/peg_generator/ @pablogsal @lysnikolaou
9399
/Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
94100
/Grammar/python.gram @pablogsal @lysnikolaou
101+
/Lib/tokenize.py @pablogsal @lysnikolaou
102+
/Lib/test/test_tokenize.py @pablogsal @lysnikolaou
95103

96104
# AST
97105
Python/ast.c @isidentical
@@ -111,6 +119,12 @@ Lib/ast.py @isidentical
111119
/Lib/test/test_subprocess.py @gpshead
112120
/Modules/*subprocess* @gpshead
113121

122+
# Limited C API & stable ABI
123+
Tools/build/stable_abi.py @encukou
124+
Misc/stable_abi.toml @encukou
125+
Doc/data/*.abi @encukou
126+
Doc/c-api/stable.rst @encukou
127+
114128
# Windows
115129
/PC/ @python/windows-team
116130
/PCbuild/ @python/windows-team
@@ -159,4 +173,9 @@ Lib/ast.py @isidentical
159173
**/*pathlib* @barneygale
160174

161175
# zipfile.Path
162-
**/*zipfile/*_path.py @jaraco
176+
**/*zipfile/_path/* @jaraco
177+
178+
# Argument Clinic
179+
/Tools/clinic/** @erlend-aasland @AlexWaygood
180+
/Lib/test/test_clinic.py @erlend-aasland @AlexWaygood
181+
Doc/howto/clinic.rst @erlend-aasland

‎.github/ISSUE_TEMPLATE/bug.md‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)