Skip to content

Commit 38070e8

Browse files
authored
Merge branch 'python:main' into selectors-fix
2 parents 55075db + ba0aca3 commit 38070e8

1,376 files changed

Lines changed: 92776 additions & 50822 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.

.gitattributes

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ Lib/test/xmltestdata/* noeol
3434
Lib/venv/scripts/common/activate text eol=lf
3535
Lib/venv/scripts/posix/* text eol=lf
3636

37+
# Prevent GitHub's web conflict editor from converting LF to CRLF
38+
*.rst text eol=lf
39+
3740
# CRLF files
3841
[attr]dos text eol=crlf
3942

@@ -81,6 +84,7 @@ Include/internal/pycore_uop_ids.h generated
8184
Include/internal/pycore_uop_metadata.h generated
8285
Include/opcode.h generated
8386
Include/opcode_ids.h generated
87+
Include/slots_generated.h generated
8488
Include/token.h generated
8589
Lib/_opcode_metadata.py generated
8690
Lib/idlelib/help.html generated
@@ -96,7 +100,6 @@ Lib/token.py generated
96100
Misc/sbom.spdx.json generated
97101
Modules/_testinternalcapi/test_cases.c.h generated
98102
Modules/_testinternalcapi/test_targets.h generated
99-
Objects/typeslots.inc generated
100103
PC/python3dll.c generated
101104
Parser/parser.c generated
102105
Parser/token.c generated
@@ -107,8 +110,10 @@ Python/generated_cases.c.h generated
107110
Python/optimizer_cases.c.h generated
108111
Python/opcode_targets.h generated
109112
Python/record_functions.c.h generated
113+
Python/slots_generated.c generated
110114
Python/stdlib_module_names.h generated
111115
Tools/peg_generator/pegen/grammar_parser.py generated
112116
aclocal.m4 generated
113117
configure generated
114118
*.min.js generated
119+
package-lock.json generated

.github/CODEOWNERS

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ Lib/test/test_build_details.py @FFY00
100100
InternalDocs/ @AA-Turner
101101

102102
# Tools, Configuration, etc
103-
Doc/Makefile @AA-Turner @hugovk
104-
Doc/_static/ @AA-Turner @hugovk
105-
Doc/conf.py @AA-Turner @hugovk
106-
Doc/make.bat @AA-Turner @hugovk
107-
Doc/requirements.txt @AA-Turner @hugovk
108-
Doc/tools/ @AA-Turner @hugovk
103+
Doc/Makefile @AA-Turner @hugovk @StanFromIreland
104+
Doc/_static/ @AA-Turner @hugovk @StanFromIreland
105+
Doc/conf.py @AA-Turner @hugovk @StanFromIreland
106+
Doc/make.bat @AA-Turner @hugovk @StanFromIreland
107+
Doc/requirements.txt @AA-Turner @hugovk @StanFromIreland
108+
Doc/tools/ @AA-Turner @hugovk @StanFromIreland
109109

110110
# PR Previews
111111
.readthedocs.yml @AA-Turner
@@ -156,16 +156,15 @@ Misc/libabigail.abignore @encukou
156156
# ----------------------------------------------------------------------------
157157

158158
# Android
159-
Android/ @mhsmith @freakboy3742
159+
Platforms/Android/ @mhsmith @freakboy3742
160160
Doc/using/android.rst @mhsmith @freakboy3742
161161
Lib/_android_support.py @mhsmith @freakboy3742
162162
Lib/test/test_android.py @mhsmith @freakboy3742
163163

164164
# iOS
165165
Doc/using/ios.rst @freakboy3742
166166
Lib/_ios_support.py @freakboy3742
167-
Apple/ @freakboy3742
168-
iOS/ @freakboy3742
167+
Platforms/Apple/ @freakboy3742
169168

170169
# macOS
171170
Mac/ @python/macos-team
@@ -176,8 +175,8 @@ Lib/test/test__osx_support.py @python/macos-team
176175
Tools/wasm/README.md @brettcannon @freakboy3742 @emmatyping
177176

178177
# WebAssembly (Emscripten)
179-
Tools/wasm/config.site-wasm32-emscripten @freakboy3742 @emmatyping
180-
Tools/wasm/emscripten @freakboy3742 @emmatyping
178+
Platforms/emscripten @freakboy3742 @emmatyping
179+
Tools/wasm/emscripten @freakboy3742 @emmatyping
181180

182181
# WebAssembly (WASI)
183182
Platforms/WASI @brettcannon @emmatyping @savannahostrowski
@@ -574,9 +573,9 @@ Lib/shutil.py @giampaolo
574573
Lib/test/test_shutil.py @giampaolo
575574

576575
# Site
577-
Lib/site.py @FFY00
578-
Lib/test/test_site.py @FFY00
579-
Doc/library/site.rst @FFY00
576+
Lib/site.py @FFY00 @warsaw
577+
Lib/test/test_site.py @FFY00 @warsaw
578+
Doc/library/site.rst @FFY00 @warsaw
580579

581580
# string.templatelib
582581
Doc/library/string.templatelib.rst @lysnikolaou @AA-Turner
@@ -587,10 +586,10 @@ Lib/test/test_string/test_templatelib.py @lysnikolaou @AA-Turner
587586
**/*sysconfig* @FFY00
588587

589588
# SQLite 3
590-
Doc/library/sqlite3.rst @berkerpeksag @erlend-aasland
591-
Lib/sqlite3/ @berkerpeksag @erlend-aasland
592-
Lib/test/test_sqlite3/ @berkerpeksag @erlend-aasland
593-
Modules/_sqlite/ @berkerpeksag @erlend-aasland
589+
Doc/library/sqlite3.rst @erlend-aasland
590+
Lib/sqlite3/ @erlend-aasland
591+
Lib/test/test_sqlite3/ @erlend-aasland
592+
Modules/_sqlite/ @erlend-aasland
594593

595594
# Subprocess
596595
Lib/subprocess.py @gpshead
@@ -623,9 +622,6 @@ Modules/_typesmodule.c @AA-Turner
623622
Lib/unittest/mock.py @cjw296
624623
Lib/test/test_unittest/testmock/ @cjw296
625624

626-
# Urllib
627-
**/*robotparser* @berkerpeksag
628-
629625
# Venv
630626
**/*venv* @vsajip @FFY00
631627

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ body:
3434
label: "CPython versions tested on:"
3535
multiple: true
3636
options:
37-
- "3.9"
3837
- "3.10"
3938
- "3.11"
4039
- "3.12"
4140
- "3.13"
4241
- "3.14"
4342
- "3.15"
43+
- "3.16"
4444
- "CPython main branch"
4545
validations:
4646
required: true

.github/ISSUE_TEMPLATE/crash.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ body:
2727
label: "CPython versions tested on:"
2828
multiple: true
2929
options:
30-
- "3.9"
3130
- "3.10"
3231
- "3.11"
3332
- "3.12"
3433
- "3.13"
3534
- "3.14"
3635
- "3.15"
36+
- "3.16"
3737
- "CPython main branch"
3838
validations:
3939
required: true

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
55
schedule:
6-
interval: "monthly"
6+
interval: "quarterly"
77
labels:
88
- "skip issue"
99
- "skip news"
@@ -24,7 +24,7 @@ updates:
2424
- package-ecosystem: "pip"
2525
directory: "/Tools/"
2626
schedule:
27-
interval: "monthly"
27+
interval: "quarterly"
2828
labels:
2929
- "skip issue"
3030
- "skip news"

.github/workflows/add-issue-header.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
# Only ever run once
1313
- opened
1414

15+
permissions:
16+
contents: read
1517

1618
jobs:
1719
add-header:
@@ -20,7 +22,7 @@ jobs:
2022
issues: write
2123
timeout-minutes: 5
2224
steps:
23-
- uses: actions/github-script@v8
25+
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
2426
with:
2527
# language=JavaScript
2628
script: |

0 commit comments

Comments
 (0)