8000 Catch up with main · python/cpython@819e0df · GitHub
[go: up one dir, main page]
Skip to content

Commit 819e0df

Browse files
brandtbucherbrandtbucher
committed
Catch up with main
2 parents c05c2af + 1303f8c commit 819e0df

File tree

1,150 files changed

+34716
-19996
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,150 files changed

+34716
-19996
lines changed

‎.azure-pipelines/windows-release/stage-publish-pythonorg.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
136136
- powershell: |
137137
$failures = 0
138-
gci "msi\*\*-webinstall.exe" -File | %{
138+
gci "msi\*\*.exe" -File | %{
139139
$d = mkdir "tests\$($_.BaseName)" -Force
140140
gci $d -r -File | del
141141
$ic = copy $_ $d -PassThru
@@ -155,7 +155,11 @@ jobs:
155155
displayName: 'Test layouts'
156156
157157
- powershell: |
158-
$hashes = gci doc\htmlhelp\python*.chm, msi\*\*.exe, embed\*.zip | `
158+
$files = gci -File "msi\*\*.exe", "embed\*.zip"
159+
if ("$(DoCHM)" -ieq "true") {
160+
$files = $files + (gci -File "doc\htmlhelp\python*.chm")
161+
}
162+
$hashes = $files | `
159163
Sort-Object Name | `
160164
Format-Table Name, @{
161165
Label="MD5";
@@ -170,9 +174,13 @@ jobs:
170174
171175
- powershell: |
172176
"Copying:"
173-
(gci msi\*\python*.asc, doc\htmlhelp\*.asc, embed\*.asc).FullName
177+
$files = gci -File "msi\*\python*.asc", "embed\*.asc"
178+
if ("$(DoCHM)" -ieq "true") {
179+
$files = $files + (gci -File "doc\htmlhelp\*.asc")
180+
}
181+
$files.FullName
174182
$d = mkdir "$(Build.ArtifactStagingDirectory)\hashes" -Force
175-
move msi\*\python*.asc, doc\htmlhelp\*.asc, embed\*.asc $d -Force
183+
move $files $d -Force
176184
gci msi -Directory | %{ move "msi\$_\*.asc" (mkdir "$d\$_" -Force) }
177185
workingDirectory: $(Build.BinariesDirectory)
178186
displayName: 'Copy GPG signatures for build'

‎.gitattributes

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,27 @@ Lib/test/sndhdrdata/sndhdr.* binary
2222
PC/classicAppCompat.* binary
2323

2424
# Text files that should not be subject to eol conversion
25-
Lib/test/cjkencodings/* -text
26-
Lib/test/decimaltestdata/*.decTest -text
27-
Lib/test/test_email/data/*.txt -text
28-
Lib/test/xmltestdata/* -text
29-
Lib/test/coding20731.py -text
30-
Lib/test/test_importlib/data01/* -text
31-
Lib/test/test_importlib/namespacedata01/* -text
25+
[attr]noeol -text
26+
27+
Lib/test/cjkencodings/* noeol
28+
Lib/test/coding20731.py noeol
29+
Lib/test/decimaltestdata/*.decTest noeol
30+
Lib/test/test_email/data/*.txt noeol
31+
Lib/test/test_importlib/data01/* noeol
32+
Lib/test/test_importlib/namespacedata01/* noeol
33+
Lib/test/xmltestdata/* noeol
3234

3335
# CRLF files
34-
*.bat text eol=crlf
35-
*.ps1 text eol=crlf
36-
*.sln text eol=crlf
37-
*.vcxproj* text eol=crlf
38-
*.props text eol=crlf
39-
*.proj text eol=crlf
40-
PCbuild/readme.txt text eol=crlf
41-
PC/readme.txt text eol=crlf
36+
[attr]dos text eol=crlf
37+
38+
*.bat dos
39+
*.proj dos
40+
*.props dos
41+
*.ps1 dos
42+
*.sln dos
43+
*.vcxproj* dos
44+
PC/readme.txt dos
45+
PCbuild/readme.txt dos
4246

4347
# Language aware diff headers
4448
# https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more
@@ -60,14 +64,18 @@ PC/readme.txt text eol=crlf
6064

6165
**/clinic/*.c.h generated
6266
*_db.h generated
67+
Doc/data/stable_abi.dat generated
6368
Doc/library/token-list.inc generated
6469
Include/internal/pycore_ast.h generated
6570
Include/internal/pycore_ast_state.h generated
71+
Include/internal/pycore_opcode.h generated
6672
Include/opcode.h generated
6773
Include/token.h generated
6874
Lib/keyword.py generated
75+
Lib/test/test_stable_abi_ctypes.py generated
6976
Lib/token.py generated
7077
Objects/typeslots.inc generated
78+
PC/python3dll.c generated
7179
Parser/parser.c generated
7280
Parser/token.c generated
7381
Programs/test_frozenmain.h generated

‎.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,6 @@ Lib/ast.py @isidentical
146146
# macOS
147147
/Mac/ @python/macos-team
148148
**/*osx_support* @python/macos-team
149+
150+
# pathlib
151+
**/*pathlib* @brettcannon

‎.github/CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ comments they leave and their "Details" links, respectively. The key points of
4444
our workflow that are not covered by a bot or status check are:
4545

4646
- All discussions that are not directly related to the code in the pull request
47-
should happen on bugs.python.org
47+
should happen on `GitHub Issues <https://github.com/python/cpython/issues>`_.
4848
- Upon your first non-trivial pull request (which includes documentation changes),
4949
feel free to add yourself to ``Misc/ACKS``
5050

‎.github/ISSUE_TEMPLATE/bug.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug report
3+
about: Submit a bug report
4+
labels: "type-bug"
5+
---
6+
7+
<!--
8+
If you're new to Python and you're not sure whether what you're experiencing is a bug, the CPython issue tracker is not
9+
the right place to seek help. Consider the following options instead:
10+
11+
- reading the Python tutorial: https://docs.python.org/3/tutorial/
12+
- posting in the "Users" category on discuss.python.org: https://discuss.python.org/c/users/7
13+
- emailing the Python-list mailing list: https://mail.python.org/mailman/listinfo/python-list
14+
- searching our issue tracker (https://github.com/python/cpython/issues) to see if
15+
your problem has already been reported
16+
-->
17+
18+
**Bug report**
19+
20+
A clear and concise description of what the bug is.
21+
Include a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example), if possible.
22+
23+
**Your environment**
24+
25+
<!-- Include as many relevant details as possible about the environment you experienced the bug in -->
26+
27+
- CPython versions tested on:
28+
- Operating system and architecture:
29+
30+
<!--
31+
You can freely edit this text. Remove any lines you believe are unnecessary.
32+
-->

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
blank_issues_enabled: false
21
contact_links:
3-
- name: ⚠ GitHub Issues Migration in progress ⚠
4-
url: https://discuss.python.org/t/github-issues-migration-status-update/14573
5-
about: Check status updates on the migration
2+
- name: "Getting help"
3+
about: "Ask questions about using Python and debugging errors on Discourse."
4+
url: "https://discuss.python.org/c/users/7"
5+
- name: "Proposing new features"
6+
about: "Submit major feature proposal (e.g. syntax changes) to an ideas forum first."
7+
url: "https://discuss.python.org/c/ideas/6"

‎.github/ISSUE_TEMPLATE/crash.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Crash report
3+
about: A hard crash of the interpreter, possibly with a core dump
4+
labels: "type-crash"
5+
---
6+
7+
<!--
8+
Use this template for hard crashes of the interpreter, segmentation faults, failed C-level assertions, and similar.
9+
Do not submit this form if you encounter an exception being unexpectedly raised from a Python function.
10+
Most of the time, these should be filed as bugs, rather than crashes.
11+
12+
The CPython interpreter is itself written in a different programming language, C.
13+
For CPython, a "crash" is when Python itself fails, leading to a traceback in the C stack.
14+
-->
15+
16+
**Crash report**
17+
18+
Tell us what happened, ideally including a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example).
19+
20+
**Error messages**
21+
22+
Enter any relevant error message caused by the crash, including a core dump if there is one.
23+
24+
**Your environment**
25+
26+
<!-- Include as many relevant details as possible about the environment you experienced the bug in -->
27+
28+
- CPython versions tested on:
29+
- Operating system and architecture:
30+
31+
<!--
32+
You can freely edit this text. Remove any lines you believe are unnecessary.
33+
-->

‎.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Documentation
3+
about: Report a problem with the documentation
4+
labels: "docs"
5+
---
6+
7+
**Documentation**
8+
9+
(A clear and concise description of the issue.)

‎.github/ISSUE_TEMPLATE/feature.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Feature or enhancement
3+
about: Submit a proposal for a new CPython feature or enhancement
4+
labels: "type-feature"
5+
---
6+
7+
**Feature or enhancement**
8+
9+
(A clear and concise description of your proposal.)
10+
11+
**Pitch**
12+
13+
(Explain why this feature or enhancement should be implemented and how it would be used.
14+
Add examples, if applicable.)
15+
16+
**Previous discussion**
17+
18+
<!--
19+
New features to Python should first be discussed elsewhere before creating issues on GitHub,
20+
for example in the "ideas" category (https://discuss.python.org/c/ideas/6) of discuss.python.org,
21+
or the python-ideas mailing list (https://mail.python.org/mailman3/lists/python-ideas.python.org/).
22+
Use this space to post links to the places where you have already discussed this feature proposal:
23+
-->
24+
25+
26+
<!--
27+
You can freely edit this text. Remove any lines you believe are unnecessary.
28+
-->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Please read this comment in its entirety. It's quite important.
77
It should be in the following format:
88
99
```
10-
bpo-NNNN: Summary of the changes made
10+
gh-NNNNN: Summary of the changes made
1111
```
1212
13-
Where: bpo-NNNN refers to the issue number in the https://bugs.python.org.
13+
Where: gh-NNNNN refers to the GitHub issue number.
1414
1515
Most PRs will require an issue number. Trivial changes, like fixing a typo, do not need an issue.
1616

‎.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ updates:
77
labels:
88
- "skip issue"
99
- "skip news"
10+
ignore:
11+
- dependency-name: "*"
12+
update-types:
13+
- "version-update:semver-minor"
14+
- "version-update:semver-patch"

‎.github/workflows/build.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Tests
22

3-
# bpo-40548: "paths-ignore" is not used to skip documentation-only PRs, because
3+
# gh-84728: "paths-ignore" is not used to skip documentation-only PRs, because
44
# it prevents to mark a job as mandatory. A PR cannot be merged if a job is
55
# mandatory but not scheduled because of "paths-ignore".
66
on:
@@ -28,7 +28,7 @@ jobs:
2828
run_tests: ${{ steps.check.outputs.run_tests }}
2929
run_ssl_tests: ${{ steps.check.outputs.run_ssl_tests }}
3030
steps:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
3232
- name: Check for source changes
3333
id: check
3434
run: |
@@ -60,8 +60,8 @@ jobs:
6060
needs: check_source
6161
if: needs.check_source.outputs.run_tests == 'true'
6262
steps:
63-
- uses: actions/checkout@v2
64-
- uses: actions/setup-python@v2
63+
- uses: actions/checkout@v3
64+
- uses: actions/setup-python@v3
6565
- name: Install Dependencies
6666
run: sudo ./.github/workflows/posix-deps-apt.sh
6767
- name: Add ccache to PATH
@@ -82,6 +82,9 @@ jobs:
8282
run: make regen-configure
8383
- name: Build CPython
8484
run: |
85+
# Deepfreeze will usually cause global objects to be added or removed,
86+
# so we run it before regen-global-objects gets rum (in regen-all).
87+
make regen-deepfreeze
8588
make -j4 regen-all
8689
make regen-stdlib-module-names
8790
- name: Check for changes
@@ -111,7 +114,7 @@ jobs:
111114
env:
112115
IncludeUwp: 'true'
113116
steps:
114-
- uses: actions/checkout@v2
117+
- uses: actions/checkout@v3
115118
- name: Build CPython
116119
run: .\PCbuild\build.bat -e -d -p Win32
117120
timeout-minutes: 30
@@ -128,7 +131,7 @@ jobs:
128131
env:
129132
IncludeUwp: 'true'
130133
steps:
131-
- uses: actions/checkout@v2
134+
- uses: actions/checkout@v3
132135
- name: Register MSVC problem matcher
133136
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
134137
- name: Build CPython
@@ -147,7 +150,7 @@ jobs:
147150
env:
148151
PYTHONSTRICTEXTENSIONBUILD: 1
149152
steps:
150-
- uses: actions/checkout@v2
153+
- uses: actions/checkout@v3
151154
- name: Prepare homebrew environment variables
152155
run: |
153156
echo "LDFLAGS=-L$(brew --prefix tcl-tk)/lib" >> $GITHUB_ENV
@@ -170,7 +173,7 @@ jobs:
170173
OPENSSL_VER: 1.1.1n
171174
PYTHONSTRICTEXTENSIONBUILD: 1
172175
steps:
173-
- uses: actions/checkout@v2
176+
- uses: actions/checkout@v3
174177
- name: Register gcc problem matcher
175178
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
176179
- name: Install Dependencies
@@ -182,7 +185,7 @@ jobs:
182185
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
183186
- name: 'Restore OpenSSL build'
184187
id: cache-openssl
185-
uses: actions/cache@v2.1.7
188+
uses: actions/cache@v3
186189
with:
187190
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
188191
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -233,7 +236,7 @@ jobs:
233236
OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}
234237
LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
235238
steps:
236-
- uses: actions/checkout@v2
239+
- uses: actions/checkout@v3
237240
- name: Register gcc problem matcher
238241
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
239242
- name: Install Dependencies
@@ -245,7 +248,7 @@ jobs:
245248
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
246249
- name: 'Restore OpenSSL build'
247250
id: cache-openssl
248-
uses: actions/cache@v2.1.7
251+
uses: actions/cache@v3
249252
with:
250253
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
251254
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -277,7 +280,7 @@ jobs:
277280
PYTHONSTRICTEXTENSIONBUILD: 1
278281
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
279282
steps:
280-
- uses: actions/checkout@v2
283+
- uses: actions/checkout@v3
281284
- name: Register gcc problem matcher
282285
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
283286
- name: Install Dependencies
@@ -289,7 +292,7 @@ jobs:
289292
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
290293
- name: 'Restore OpenSSL build'
291294
id: cache-openssl
292-
uses: actions/cache@v2.1.7
295+
uses: actions/cache@v3
293296
with:
294297
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
295298
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

0 commit comments

Comments
 (0)
0