Skip to content

Commit 27245ec

Browse files
authored
Merge branch 'main' into pythongh-104090-fix-leaked-semaphors-on-test_concurrent_futures-v2
2 parents cd377e6 + 87cd20a commit 27245ec

File tree

2,420 files changed

+171971
-106059
lines changed

Some content is hidden

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

2,420 files changed

+171971
-106059
lines changed

.azure-pipelines/pr.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,3 @@ jobs:
2626

2727
steps:
2828
- template: ./posix-steps.yml
29-
30-
31-
- job: Windows_PR_Tests
32-
displayName: Windows PR Tests
33-
dependsOn: Prebuild
34-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
35-
36-
pool:
37-
vmImage: windows-2022
38-
39-
strategy:
40-
matrix:
41-
win32:
42-
arch: win32
43-
buildOpt: '-p Win32'
44-
testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
45-
testRunPlatform: win32
46-
win64:
47-
arch: amd64
48-
buildOpt: '-p x64'
49-
testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
50-
testRunPlatform: win64
51-
winarm64:
52-
arch: arm64
53-
buildOpt: '-p arm64'
54-
maxParallel: 4
55-
56-
steps:
57-
- template: ./windows-steps.yml
58-
parameters:
59-
targetBranch: $(System.PullRequest.TargetBranch)

.cirrus-DISABLED.yml

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

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENV WASI_SDK_VERSION=20
66
ENV WASI_SDK_PATH=/opt/wasi-sdk
77

88
ENV WASMTIME_HOME=/opt/wasmtime
9-
ENV WASMTIME_VERSION=9.0.1
9+
ENV WASMTIME_VERSION=14.0.4
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)' && \

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ indent_style = space
88
[*.{py,c,cpp,h}]
99
indent_size = 4
1010

11+
[*.rst]
12+
indent_size = 3
13+
1114
[*.yml]
1215
indent_size = 2

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ Include/internal/pycore_ast_state.h generated
7676
Include/internal/pycore_opcode.h generated
7777
Include/internal/pycore_opcode_metadata.h generated
7878
Include/internal/pycore_*_generated.h generated
79+
Include/internal/pycore_uop_ids.h generated
7980
Include/opcode.h generated
8081
Include/opcode_ids.h generated
8182
Include/token.h generated
@@ -84,6 +85,7 @@ Lib/keyword.py generated
8485
Lib/test/levenshtein_examples.json generated
8586
Lib/test/test_stable_abi_ctypes.py generated
8687
Lib/token.py generated
88+
Misc/sbom.spdx.json generated
8789
Objects/typeslots.inc generated
8890
PC/python3dll.c generated
8991
Parser/parser.c generated
@@ -92,7 +94,6 @@ Programs/test_frozenmain.h generated
9294
Python/Python-ast.c generated
9395
Python/executor_cases.c.h generated
9496
Python/generated_cases.c.h generated
95-
Python/abstract_interp_cases.c.h generated
9697
Python/opcode_targets.h generated
9798
Python/stdlib_module_names.h generated
9899
Tools/peg_generator/pegen/grammar_parser.py generated

.github/CODEOWNERS

Lines changed: 77 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,53 @@ configure* @erlend-aasland @corona10
2121
**/*context* @1st1
2222
**/*genobject* @markshannon
2323
**/*hamt* @1st1
24+
**/*jit* @brandtbucher
2425
Objects/set* @rhettinger
2526
Objects/dict* @methane @markshannon
2627
Objects/typevarobject.c @JelleZijlstra
2728
Objects/type* @markshannon
2829
Objects/codeobject.c @markshannon
2930
Objects/frameobject.c @markshannon
3031
Objects/call.c @markshannon
31-
Python/ceval.c @markshannon
32+
Python/ceval*.c @markshannon @gvanrossum
33+
Python/ceval*.h @markshannon @gvanrossum
3234
Python/compile.c @markshannon @iritkatriel
3335
Python/assemble.c @markshannon @iritkatriel
3436
Python/flowgraph.c @markshannon @iritkatriel
3537
Python/ast_opt.c @isidentical
38+
Python/bytecodes.c @markshannon @gvanrossum
39+
Python/optimizer*.c @markshannon @gvanrossum
3640
Lib/test/test_patma.py @brandtbucher
37-
Lib/test/test_peepholer.py @brandtbucher
3841
Lib/test/test_type_*.py @JelleZijlstra
42+
Lib/test/test_capi/test_misc.py @markshannon @gvanrossum
43+
Tools/c-analyzer/ @ericsnowcurrently
44+
45+
# dbm
46+
**/*dbm* @corona10 @erlend-aasland @serhiy-storchaka
47+
48+
# runtime state/lifecycle
49+
**/*pylifecycle* @ericsnowcurrently
50+
**/*pystate* @ericsnowcurrently
51+
**/*preconfig* @ericsnowcurrently
52+
**/*initconfig* @ericsnowcurrently
53+
**/*pathconfig* @ericsnowcurrently
54+
**/*sysmodule* @ericsnowcurrently
55+
**/*bltinmodule* @ericsnowcurrently
56+
**/*gil* @ericsnowcurrently
57+
Include/internal/pycore_runtime.h @ericsnowcurrently
58+
Include/internal/pycore_interp.h @ericsnowcurrently
59+
Include/internal/pycore_tstate.h @ericsnowcurrently
60+
Include/internal/pycore_*_state.h @ericsnowcurrently
61+
Include/internal/pycore_*_init.h @ericsnowcurrently
62+
Include/internal/pycore_atexit.h @ericsnowcurrently
63+
Include/internal/pycore_freelist.h @ericsnowcurrently
64+
Include/internal/pycore_global_objects.h @ericsnowcurrently
65+
Include/internal/pycore_obmalloc.h @ericsnowcurrently
66+
Include/internal/pycore_pymem.h @ericsnowcurrently
67+
Modules/main.c @ericsnowcurrently
68+
Programs/_bootstrap_python.c @ericsnowcurrently
69+
Programs/python.c @ericsnowcurrently
70+
Tools/build/generate_global_objects.py @ericsnowcurrently
3971

4072
# Exceptions
4173
Lib/traceback.py @iritkatriel
@@ -45,13 +77,13 @@ Objects/exceptions.c @iritkatriel
4577
Python/traceback.c @iritkatriel
4678

4779
# Hashing
48-
**/*hashlib* @tiran
49-
**/*pyhash* @tiran
50-
**/*sha* @tiran
51-
**/*md5* @tiran
52-
**/*blake* @tiran
53-
/Modules/_blake2/** @tiran
54-
/Modules/_sha3/** @tiran
80+
**/*hashlib* @gpshead @tiran
81+
**/*pyhash* @gpshead @tiran
82+
**/sha* @gpshead @tiran
83+
Modules/md5* @gpshead @tiran
84+
**/*blake* @gpshead @tiran
85+
Modules/_blake2/** @gpshead @tiran
86+
Modules/_hacl/** @gpshead
5587

5688
# logging
5789
**/*logging* @vsajip
@@ -71,7 +103,20 @@ Python/traceback.c @iritkatriel
71103
# Import (including importlib).
72104
**/*import* @brettcannon @ericsnowcurrently @ncoghlan @warsaw
73105
/Python/import.c @kumaraditya303
74-
**/*importlib/resources/* @jaraco @warsaw @FFY00
106+
Python/dynload_*.c @ericsnowcurrently
107+
**/*freeze* @ericsnowcurrently
108+
**/*frozen* @ericsnowcurrently
109+
**/*modsupport* @ericsnowcurrently
110+
**/*modulefinder* @ericsnowcurrently
111+
**/*moduleobject* @ericsnowcurrently
112+
**/*multiphase* @ericsnowcurrently
113+
**/*pkgutil* @ericsnowcurrently
114+
**/*pythonrun* @ericsnowcurrently
115+
**/*runpy* @ericsnowcurrently
116+
**/*singlephase* @ericsnowcurrently
117+
Lib/test/test_module/ @ericsnowcurrently
118+
Doc/c-api/module.rst @ericsnowcurrently
119+
**/*importlib/resources/* @jaraco @warsaw @FFY00
75120
**/importlib/metadata/* @jaraco @warsaw
76121

77122
# Dates and times
@@ -102,6 +147,9 @@ Include/internal/pycore_time.h @pganssle @abalkin
102147
/Lib/tokenize.py @pablogsal @lysnikolaou
103148
/Lib/test/test_tokenize.py @pablogsal @lysnikolaou
104149

150+
# Code generator
151+
/Tools/cases_generator/ @gvanrossum
152+
105153
# AST
106154
Python/ast.c @isidentical
107155
Parser/asdl.py @isidentical
@@ -112,6 +160,9 @@ Lib/ast.py @isidentical
112160
/Lib/unittest/mock.py @cjw296
113161
/Lib/test/test_unittest/testmock/* @cjw296
114162

163+
# multiprocessing
164+
**/*multiprocessing* @gpshead
165+
115166
# SQLite 3
116167
**/*sqlite* @berkerpeksag @erlend-aasland
117168

@@ -149,9 +200,11 @@ Doc/c-api/stable.rst @encukou
149200

150201
**/*dataclasses* @ericvsmith
151202

203+
**/*ensurepip* @pfmoore @pradyunsg
204+
152205
**/*idlelib* @terryjreedy
153206

154-
**/*typing* @gvanrossum @Fidget-Spinner @JelleZijlstra @AlexWaygood
207+
**/*typing* @JelleZijlstra @AlexWaygood
155208

156209
**/*ftplib @giampaolo
157210
**/*shutil @giampaolo
@@ -177,9 +230,20 @@ Doc/c-api/stable.rst @encukou
177230
**/*zipfile/_path/* @jaraco
178231

179232
# Argument Clinic
180-
/Tools/clinic/** @erlend-aasland @AlexWaygood
181-
/Lib/test/test_clinic.py @erlend-aasland @AlexWaygood
233+
/Tools/clinic/** @erlend-aasland
234+
/Lib/test/test_clinic.py @erlend-aasland
182235
Doc/howto/clinic.rst @erlend-aasland
183236

237+
# Subinterpreters
238+
**/*interpreteridobject.* @ericsnowcurrently
239+
**/*crossinterp* @ericsnowcurrently
240+
Lib/test/support/interpreters/ @ericsnowcurrently
241+
Modules/_xx*interp*module.c @ericsnowcurrently
242+
Lib/test/test_interpreters/ @ericsnowcurrently
243+
184244
# WebAssembly
185245
/Tools/wasm/ @brettcannon
246+
247+
# SBOM
248+
/Misc/sbom.spdx.json @sethmlarson
249+
/Tools/build/generate_sbom.py @sethmlarson

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ body:
3939
- "3.10"
4040
- "3.11"
4141
- "3.12"
42+
- "3.13"
4243
- "CPython main branch"
4344
validations:
4445
required: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
permissions:
2020
issues: write
2121
steps:
22-
- uses: actions/github-script@v6
22+
- uses: actions/github-script@v7
2323
with:
2424
# language=JavaScript
2525
script: |

0 commit comments

Comments
 (0)