Skip to content

Commit 632533e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into pr_103339
2 parents b7ef0e1 + aa5b762 commit 632533e

1,495 files changed

Lines changed: 94646 additions & 111116 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(build.sourceBranchName)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1t
60+
openssl_version: 1.1.1u
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1t
86+
openssl_version: 1.1.1u
8787

8888
steps:
8989
- template: ./posix-steps.yml

.azure-pipelines/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1t
60+
openssl_version: 1.1.1u
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1t
86+
openssl_version: 1.1.1u
8787

8888
steps:
8989
- template: ./posix-steps.yml

.devcontainer/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ 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

12-
RUN dnf -y --nodocs install git clang xz python3-blurb dnf-plugins-core && \
13-
dnf -y --nodocs builddep python3 && \
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 && \
1414
dnf -y clean all
1515

1616
RUN mkdir ${WASI_SDK_PATH} && \

.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: 4 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

.github/CODEOWNERS

Lines changed: 18 additions & 7 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

@@ -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

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ updates:
1212
update-types:
1313
- "version-update:semver-minor"
1414
- "version-update:semver-patch"
15+
- package-ecosystem: "pip"
16+
directory: "/Tools/clinic/"
17+
schedule:
18+
interval: "monthly"
19+
labels:
20+
- "skip issue"
21+
- "skip news"

0 commit comments

Comments
 (0)