Skip to content

Commit d1016a6

Browse files
illia-villia-v
authored
Merge branch 'main' into pythongh-102509 
2 parents 3d240a8 + 0aa58fa commit d1016a6

2,091 files changed

Lines changed: 141916 additions & 136265 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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
11+
.*# pragma: no cover
12+
.*# pragma: no branch
13+
14+
# Additions for IDLE:
15+
.*# htest #
16+
if not (_htest or _utest):
17+
if not .*_utest:
18+
if .*_htest:
19+

‎.devcontainer/Dockerfile‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM docker.io/library/fedora:37
2+
3+
ENV CC=clang
4+
5+
ENV WASI_SDK_VERSION=20
6+
ENV WASI_SDK_PATH=/opt/wasi-sdk
7+
8+
ENV WASMTIME_HOME=/opt/wasmtime
9+
ENV WASMTIME_VERSION=9.0.1
10+
ENV WASMTIME_CPU_ARCH=x86_64
11+
12+
RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \
13+
dnf -y --nodocs --setopt=install_weak_deps=False builddep python3 && \
14+
dnf -y clean all
15+
16+
RUN mkdir ${WASI_SDK_PATH} && \
17+
curl --location https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-linux.tar.gz | \
18+
tar --strip-components 1 --directory ${WASI_SDK_PATH} --extract --gunzip
19+
20+
RUN mkdir --parents ${WASMTIME_HOME} && \
21+
curl --location "https://github.com/bytecodealliance/wasmtime/releases/download/v${WASMTIME_VERSION}/wasmtime-v${WASMTIME_VERSION}-${WASMTIME_CPU_ARCH}-linux.tar.xz" | \
22+
xz --decompress | \
23+
tar --strip-components 1 --directory ${WASMTIME_HOME} -x && \
24+
ln -s ${WASMTIME_HOME}/wasmtime /usr/local/bin

‎.devcontainer/devcontainer.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"build": {
3+
"dockerfile": "Dockerfile"
4+
},
5+
"onCreateCommand": [
6+
// Install common tooling.
7+
"dnf",
8+
"install",
9+
"-y",
10+
"which",
11+
"zsh",
12+
"fish",
13+
// For umask fix below.
14+
"/usr/bin/setfacl"
15+
],
16+
"updateContentCommand": {
17+
// Using the shell for `nproc` usage.
18+
"python": "./configure --config-cache --with-pydebug && make -s -j `nproc`",
19+
"docs": [
20+
"make",
21+
"--directory",
22+
"Doc",
23+
"venv",
24+
"html"
25+
]
26+
},
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+
},
32+
"customizations": {
33+
"vscode": {
34+
"extensions": [
35+
// Highlighting for Parser/Python.asdl.
36+
"brettcannon.zephyr-asdl",
37+
// Highlighting for configure.ac.
38+
"maelvalais.autoconf",
39+
// C auto-complete.
40+
"ms-vscode.cpptools",
41+
// To view HTML build of docs.
42+
"ms-vscode.live-server",
43+
// Python auto-complete.
44+
"ms-python.python"
45+
],
46+
"settings": {
47+
"C_Cpp.default.compilerPath": "/usr/bin/clang",
48+
"C_Cpp.default.cStandard": "c11",
49+
"C_Cpp.default.defines": [
50+
"CONFIG_64",
51+
"Py_BUILD_CORE"
52+
],
53+
"C_Cpp.default.includePath": [
54+
"${workspaceFolder}/*",
55+
"${workspaceFolder}/Include/**"
56+
],
57+
// https://github.com/microsoft/vscode-cpptools/issues/10732
58+
"C_Cpp.errorSquiggles": "disabled",
59+
"editor.insertSpaces": true,
60+
"editor.rulers": [
61+
80
62+
],
63+
"editor.tabSize": 4,
64+
"editor.trimAutoWhitespace": true,
65+
"files.associations": {
66+
"*.h": "c"
67+
},
68+
"files.encoding": "utf8",
69+
"files.eol": "\n",
70+
"files.insertFinalNewline": true,
71+
"files.trimTrailingWhitespace": true,
72+
"python.analysis.diagnosticSeverityOverrides": {
73+
// Complains about shadowing the stdlib w/ the stdlib.
74+
"reportShadowedImports": "none",
75+
// Doesn't like _frozen_importlib.
76+
"reportMissingImports": "none"
77+
},
78+
"python.analysis.extraPaths": [
79+
"Lib"
80+
],
81+
"python.defaultInterpreterPath": "./python",
82+
"[restructuredtext]": {
83+
"editor.tabSize": 3
84+
}
85+
}
86+
}
87+
}
88+
}

‎.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
@@ -32,6 +31,10 @@ Lib/test/test_importlib/resources/data01/* noeol
3231
Lib/test/test_importlib/resources/namespacedata01/* noeol
3332
Lib/test/xmltestdata/* noeol
3433

34+
# Shell scripts should have LF even on Windows because of Cygwin
35+
Lib/venv/scripts/common/activate text eol=lf
36+
Lib/venv/scripts/posix/* text eol=lf
37+
3538
# CRLF files
3639
[attr]dos text eol=crlf
3740

@@ -82,6 +85,7 @@ Parser/parser.c generated
8285
Parser/token.c generated
8386
Programs/test_frozenmain.h generated
8487
Python/Python-ast.c generated
88+
Python/executor_cases.c.h generated
8589
Python/generated_cases.c.h generated
8690
Python/opcode_targets.h generated
8791
Python/stdlib_module_names.h generated

‎.github/CODEOWNERS‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,36 @@
55
# https://git-scm.com/docs/gitignore#_pattern_format
66

77
# GitHub
8-
.github/** @ezio-melotti
8+
.github/** @ezio-melotti @hugovk
9+
10+
# pre-commit
11+
.pre-commit-config.yaml @hugovk @AlexWaygood
912

1013
# Build system
1114
configure* @erlend-aasland @corona10
1215

1316
# asyncio
14-
**/*asyncio* @1st1 @asvetlov @gvanrossum @kumaraditya303
17+
**/*asyncio* @1st1 @asvetlov @gvanrossum @kumaraditya303 @willingc
1518

1619
# Core
1720
**/*context* @1st1
1821
**/*genobject* @markshannon
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
2529
Objects/call.c @markshannon
2630
Python/ceval.c @markshannon
2731
Python/compile.c @markshannon @iritkatriel
32+
Python/assemble.c @markshannon @iritkatriel
33+
Python/flowgraph.c @markshannon @iritkatriel
2834
Python/ast_opt.c @isidentical
2935
Lib/test/test_patma.py @brandtbucher
3036
Lib/test/test_peepholer.py @brandtbucher
37+
Lib/test/test_type_*.py @JelleZijlstra
3138

3239
# Exceptions
3340
Lib/traceback.py @iritkatriel
@@ -61,11 +68,7 @@ Python/traceback.c @iritkatriel
6168
/Tools/build/parse_html5_entities.py @ezio-melotti
6269

6370
# Import (including importlib).
64-
# Ignoring importlib.h so as to not get flagged on
65-
# all pull requests that change the emitted
66-
# bytecode.
67-
**/*import*.c @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
68-
**/*import*.py @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
71+
**/*import* @brettcannon @ericsnowcurrently @ncoghlan @warsaw
6972
**/*importlib/resources/* @jaraco @warsaw @FFY00
7073
**/importlib/metadata/* @jaraco @warsaw
7174

@@ -76,7 +79,7 @@ Doc/library/time.rst @pganssle @abalkin
7679
Lib/test/test_time.py @pganssle @abalkin
7780
Modules/timemodule.c @pganssle @abalkin
7881
Python/pytime.c @pganssle @abalkin
79-
Include/pytime.h @pganssle @abalkin
82+
Include/internal/pycore_time.h @pganssle @abalkin
8083

8184
# Email and related
8285
**/*mail* @python/email-team
@@ -94,6 +97,8 @@ Include/pytime.h @pganssle @abalkin
9497
/Tools/peg_generator/ @pablogsal @lysnikolaou
9598
/Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
9699
/Grammar/python.gram @pablogsal @lysnikolaou
100+
/Lib/tokenize.py @pablogsal @lysnikolaou
101+
/Lib/test/test_tokenize.py @pablogsal @lysnikolaou
97102

98103
# AST
99104
Python/ast.c @isidentical
@@ -113,6 +118,12 @@ Lib/ast.py @isidentical
113118
/Lib/test/test_subprocess.py @gpshead
114119
/Modules/*subprocess* @gpshead
115120

121+
# Limited C API & stable ABI
122+
Tools/build/stable_abi.py @encukou
123+
Misc/stable_abi.toml @encukou
124+
Doc/data/*.abi @encukou
125+
Doc/c-api/stable.rst @encukou
126+
116127
# Windows
117128
/PC/ @python/windows-team
118129
/PCbuild/ @python/windows-team
@@ -161,4 +172,9 @@ Lib/ast.py @isidentical
161172
**/*pathlib* @barneygale
162173

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

0 commit comments

Comments
 (0)