Skip to content

Commit ebaab4d

Browse files
authored
Merge branch 'main' into 62-Concurrent-kwargs-growth-ft
2 parents d3a8e47 + 627eabf commit ebaab4d

1,298 files changed

Lines changed: 85824 additions & 63298 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.

‎.claude/CLAUDE.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/CODEOWNERS‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@
6363
.azure-pipelines/ @AA-Turner
6464

6565
# GitHub & related scripts
66-
.github/ @ezio-melotti @hugovk @AA-Turner @webknjaz @itamaro @JacobCoffee
67-
Tools/build/compute-changes.py @AA-Turner @hugovk @webknjaz
68-
Lib/test/test_tools/test_compute_changes.py @AA-Turner @hugovk @webknjaz
66+
.github/ @ezio-melotti @hugovk @AA-Turner @webknjaz @itamaro @JacobCoffee @StanFromIreland
67+
Tools/build/compute-changes.py @AA-Turner @hugovk @webknjaz @StanFromIreland
68+
Lib/test/test_tools/test_compute_changes.py @AA-Turner @hugovk @webknjaz @StanFromIreland
6969
Tools/build/verify_ensurepip_wheels.py @AA-Turner @pfmoore @pradyunsg
7070

7171
# Pre-commit
72-
.pre-commit-config.yaml @hugovk @JacobCoffee
73-
.ruff.toml @hugovk @AlexWaygood @AA-Turner @JacobCoffee
72+
.pre-commit-config.yaml @hugovk @JacobCoffee @StanFromIreland
73+
.ruff.toml @hugovk @AlexWaygood @AA-Turner @JacobCoffee @StanFromIreland
7474

7575
# Patchcheck
7676
Tools/patchcheck/ @AA-Turner @itamaro
@@ -290,9 +290,10 @@ Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
290290
InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-Turner
291291

292292
# Lazy imports (PEP 810)
293-
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
294-
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
295-
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
293+
.github/workflows/reusable-test-lazy-imports-all.yml @yhg1s @DinoV @pablogsal
294+
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
295+
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
296+
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
296297

297298
# Micro-op / μop / Tier 2 Optimiser
298299
Python/optimizer.c @markshannon @Fidget-Spinner
@@ -630,7 +631,7 @@ Lib/test/test_unittest/testmock/ @cjw296
630631
Doc/library/zlib.rst @StanFromIreland
631632
Lib/compression/zlib.py @StanFromIreland
632633
Lib/test/test_zlib.py @StanFromIreland
633-
Modules/_zlibmodule.c @StanFromIreland
634+
Modules/zlibmodule.c @StanFromIreland
634635

635636
# Zipfile.Path
636637
Lib/test/test_zipfile/_path/ @jaraco
@@ -655,5 +656,8 @@ Objects/**/clinic/
655656
PC/**/clinic/
656657
Python/**/clinic/
657658

659+
# Exclude Lazy Imports=all CI carve out file
660+
Lib/test/lazy_imports_all_exclude.txt
661+
658662
# Exclude HTML IDs list
659663
Doc/tools/removed-ids.txt

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ body:
1616
Make sure to also search the [CPython issue tracker](https://github.com/python/cpython/issues?q=is%3Aissue+sort%3Acreated-desc) to check that the bug has not already been reported.
1717
- type: textarea
1818
attributes:
19-
label: "Bug description:"
19+
label: "Bug report"
2020
description: >
2121
Give a clear and concise description of what happened.
2222
Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
@@ -34,7 +34,6 @@ body:
3434
label: "CPython versions tested on:"
3535
multiple: true
3636
options:
37-
- "3.10"
3837
- "3.11"
3938
- "3.12"
4039
- "3.13"

‎.github/ISSUE_TEMPLATE/crash.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ body:
1010
The CPython interpreter is written in a different programming language, C. A "CPython crash" is when Python itself fails, leading to a traceback in the C stack.
1111
- type: textarea
1212
attributes:
13-
label: What happened?
13+
label: Crash report
1414
description: >
15+
Give a clear and concise description of what happened.
1516
Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
1617
[Copy and paste code where possible rather than using screenshots](https://meta.stackoverflow.com/a/285557/13990016),
1718
and put any code blocks inside triple backticks.
@@ -27,7 +28,6 @@ body:
2728
label: "CPython versions tested on:"
2829
multiple: true
2930
options:
30-
- "3.10"
3131
- "3.11"
3232
- "3.12"
3333
- "3.13"

‎.github/ISSUE_TEMPLATE/feature.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
Major feature proposals should generally be discussed on [Discourse](https://discuss.python.org/c/ideas/6) before opening a GitHub issue. Wait until it's clear that most people support your idea before filling in this form.
1313
- type: textarea
1414
attributes:
15-
label: "Proposal:"
15+
label: "Feature or enhancement"
1616
description: >
1717
Explain your proposal, why it should be implemented, and how it would be used.
1818
Add examples, if applicable.

‎.github/VULNERABILITY_REPORT.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: Vulnerability report
2+
description: Privately report a potential security vulnerability in CPython
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
**Not all bugs are vulnerabilities.** Before submitting, read the [Python security policy](https://devguide.python.org/security/policy/) to understand which issues are vulnerabilities and what versions of Python accept reports.
8+
9+
Keep the report short and in plain text: no headers, tables, PDFs, binaries, or severity and CVSS information.
10+
11+
Reports that do not contain a potential security vulnerability will be discarded without a reply.
12+
13+
To report vulnerabilities that affect other projects (such as pip or python.org), or if you are not sure where to send your report, email [security@python.org](mailto:security@python.org).
14+
- type: textarea
15+
id: summary
16+
attributes:
17+
label: Summary
18+
description: A few sentences describing the vulnerability.
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: threat_model
23+
attributes:
24+
label: Threat model
25+
description: >
26+
What does the attacker control, and what do they gain? Describe the code, configuration, or deployment that may exist in the real world and is exploitable. Where possible, cite the relevant part of the [security policy](https://devguide.python.org/security/policy/#what-types-of-bugs-are-vulnerabilities).
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: proof_of_concept
31+
attributes:
32+
label: Proof of concept
33+
description: >
34+
A script that reproduces the issue and clearly indicates whether the vulnerability is present, such as exiting with `1` if vulnerable and `0` if not. If it depends on a specially constructed binary file, include a script to construct the file rather than the file itself.
35+
36+
Wrap scripts longer than a few lines in a [collapsed section](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections) using `<details> ... </details>`.
37+
validations:
38+
required: true
39+
- type: dropdown
40+
id: versions
41+
attributes:
42+
label: "CPython versions tested on:"
43+
description: >
44+
If any tested version was not vulnerable, say which in the summary. Only [supported versions](https://devguide.python.org/versions/) accept reports.
45+
multiple: true
46+
options:
47+
- "3.11"
48+
- "3.12"
49+
- "3.13"
50+
- "3.14"
51+
- "3.15"
52+
- "3.16"
53+
- "CPython main branch"
54+
validations:
55+
required: true
56+
- type: textarea
57+
id: patch
58+
attributes:
59+
label: Suggested fix
60+
description: Ideally, a minimal patch with the mitigation.
61+
validations:
62+
required: false
63+
- type: checkboxes
64+
id: checklist
65+
attributes:
66+
label: Before submitting
67+
options:
68+
- label: I have read the security policy and evaluated this report against it.
69+
required: true
70+
- label: I have checked that this issue is not already resolved on the `main` branch.
71+
required: true
72+
- label: I have verified the factual validity of everything in this report, including any content produced by an LLM.
73+
required: true

‎.github/dependabot.yml‎

Lines changed: 95 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ 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"
1510
groups:
1611
actions:
1712
patterns:
@@ -21,12 +16,104 @@ updates:
2116
# Cooldowns protect against supply chain attacks by avoiding the
2217
# highest-risk window immediately after new releases.
2318
default-days: 14
19+
2420
- package-ecosystem: "pip"
2521
directory: "/Tools/"
2622
schedule:
2723
interval: "quarterly"
28-
labels:
29-
- "skip issue"
30-
- "skip news"
24+
labels: ["skip issue", "skip news"]
25+
groups:
26+
pip:
27+
patterns: ["*"]
28+
cooldown:
29+
default-days: 14
30+
31+
# Release branches: Dependabot only reads this file from the default
32+
# branch, so each branch that should get its own actions bumps needs an
33+
# entry here with `target-branch`. Add one when a new release branch is
34+
# created, and remove when the branch reaches end-of-life.
35+
- package-ecosystem: "github-actions"
36+
target-branch: "3.15"
37+
directory: "/"
38+
schedule:
39+
interval: "quarterly"
40+
labels: ["skip issue", "skip news"]
41+
groups:
42+
actions:
43+
patterns: ["*"]
44+
cooldown:
45+
default-days: 14
46+
47+
- package-ecosystem: "github-actions"
48+
target-branch: "3.14"
49+
directory: "/"
50+
schedule:
51+
interval: "quarterly"
52+
labels: ["skip issue", "skip news"]
53+
groups:
54+
actions:
55+
patterns: ["*"]
56+
cooldown:
57+
default-days: 14
58+
59+
- package-ecosystem: "github-actions"
60+
target-branch: "3.13"
61+
directory: "/"
62+
schedule:
63+
interval: "quarterly"
64+
labels: ["skip issue", "skip news"]
65+
groups:
66+
actions:
67+
patterns: ["*"]
68+
cooldown:
69+
default-days: 14
70+
71+
- package-ecosystem: "github-actions"
72+
target-branch: "3.12"
73+
directory: "/"
74+
schedule:
75+
interval: "quarterly"
76+
labels: ["skip issue", "skip news"]
77+
groups:
78+
actions:
79+
patterns: ["*"]
80+
cooldown:
81+
default-days: 14
82+
83+
- package-ecosystem: "github-actions"
84+
target-branch: "3.11"
85+
directory: "/"
86+
schedule:
87+
interval: "quarterly"
88+
labels: ["skip issue", "skip news"]
89+
groups:
90+
actions:
91+
patterns: ["*"]
92+
cooldown:
93+
default-days: 14
94+
95+
# Only bump bugfix branches for pip. Remove
96+
# the entry when branch goes security-only.
97+
- package-ecosystem: "pip"
98+
target-branch: "3.15"
99+
directory: "/Tools/"
100+
schedule:
101+
interval: "quarterly"
102+
labels: ["skip issue", "skip news"]
103+
groups:
104+
pip:
105+
patterns: ["*"]
106+
cooldown:
107+
default-days: 14
108+
109+
- package-ecosystem: "pip"
110+
target-branch: "3.14"
111+
directory: "/Tools/"
112+
schedule:
113+
interval: "quarterly"
114+
labels: ["skip issue", "skip news"]
115+
groups:
116+
pip:
117+
patterns: ["*"]
31118
cooldown:
32119
default-days: 14

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

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

0 commit comments

Comments
 (0)