Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 74f36c5

Browse files
serhiy-storchakaserhiy-storchaka
committed
Merge remote-tracking branch 'upstream/main' into clinic-param-aliases
# Conflicts: # Modules/clinic/_testclinic.c.h # Modules/clinic/_testclinic_depr.c.h # Tools/clinic/libclinic/parse_args.py
2 parents 5cb40a5 + f154574 commit 74f36c5

628 files changed

Lines changed: 19735 additions & 5759 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../AGENTS.md

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,12 @@ Doc/library/tomllib.rst @encukou @hauntsaninja
598598
Lib/test/test_tomllib/ @encukou @hauntsaninja
599599
Lib/tomllib/ @encukou @hauntsaninja
600600

601+
# Turtle
602+
Doc/library/turtle.rst @StanFromIreland
603+
Doc/library/turtle-star.png @StanFromIreland
604+
Lib/test/test_turtle.py @StanFromIreland
605+
Lib/turtle.py @StanFromIreland
606+
601607
# Typing
602608
Doc/library/typing.rst @JelleZijlstra @AlexWaygood
603609
Lib/test/test_typing.py @JelleZijlstra @AlexWaygood
@@ -624,7 +630,7 @@ Lib/test/test_unittest/testmock/ @cjw296
624630
Doc/library/zlib.rst @StanFromIreland
625631
Lib/compression/zlib.py @StanFromIreland
626632
Lib/test/test_zlib.py @StanFromIreland
627-
Modules/_zlibmodule.c @StanFromIreland
633+
Modules/zlibmodule.c @StanFromIreland
628634

629635
# Zipfile.Path
630636
Lib/test/test_zipfile/_path/ @jaraco

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,13 @@ jobs:
268268
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
269269
# supported by important vendors such as AWS-LC.
270270
- { name: openssl, version: 1.1.1w }
271-
- { name: openssl, version: 3.0.21 }
272-
- { name: openssl, version: 3.4.6 }
273-
- { name: openssl, version: 3.5.7 }
274-
- { name: openssl, version: 3.6.3 }
275-
- { name: openssl, version: 4.0.1 }
271+
- { name: openssl, version: 3.0.22 }
272+
- { name: openssl, version: 3.4.7 }
273+
- { name: openssl, version: 3.5.8 }
274+
- { name: openssl, version: 3.6.4 }
275+
- { name: openssl, version: 4.0.2 }
276276
## AWS-LC
277-
- { name: aws-lc, version: 5.0.0 }
277+
- { name: aws-lc, version: 5.5.0 }
278278
env:
279279
SSLLIB_VER: ${{ matrix.ssllib.version }}
280280
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -379,7 +379,7 @@ jobs:
379379
needs: build-context
380380
if: needs.build-context.outputs.run-ubuntu == 'true'
381381
env:
382-
OPENSSL_VER: 3.5.7
382+
OPENSSL_VER: 3.5.8
383383
PYTHONSTRICTEXTENSIONBUILD: 1
384384
steps:
385385
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
@@ -487,7 +487,7 @@ jobs:
487487
matrix:
488488
os: [ubuntu-26.04]
489489
env:
490-
OPENSSL_VER: 3.5.7
490+
OPENSSL_VER: 3.5.8
491491
PYTHONSTRICTEXTENSIONBUILD: 1
492492
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
493493
steps:

‎.github/workflows/reusable-check-html-ids.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ jobs:
2020
with:
2121
persist-credentials: false
2222
ref: ${{ github.event.pull_request.head.sha }}
23-
- name: 'Downgrade Git'
24-
# Temporarily downgrade to 2.43 until 2.55 is in the runner image,
25-
# to avoid "fatal: shallow file has changed since we read it" bug.
26-
# See https://github.com/python/cpython/issues/151365.
27-
run: |
28-
sudo apt-get install -y --allow-downgrades 'git=1:2.43.*' 'git-man=1:2.43.*'
29-
git --version
3023
- name: 'Find merge base'
3124
id: merge-base
3225
run: |

‎.github/workflows/reusable-context.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@ jobs:
9090
|| ''
9191
}}
9292
93-
- name: 'Downgrade Git'
94-
# Temporarily downgrade to 2.43 until 2.55 is in the runner image,
95-
# to avoid "fatal: shallow file has changed since we read it" bug.
96-
# See https://github.com/python/cpython/issues/151365.
97-
if: github.event_name == 'pull_request'
98-
run: |
99-
sudo apt-get install -y --allow-downgrades 'git=1:2.43.*' 'git-man=1:2.43.*'
100-
git --version
101-
10293
# Adapted from https://github.com/actions/checkout/issues/520#issuecomment-1167205721
10394
- name: Fetch commits to get branch diff
10495
if: github.event_name == 'pull_request'

‎.github/workflows/reusable-docs.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ jobs:
4747
&& github.event.pull_request.head.sha
4848
|| ''
4949
}}
50-
- name: 'Downgrade Git'
51-
# Temporarily downgrade to 2.43 until 2.55 is in the runner image,
52-
# to avoid "fatal: shallow file has changed since we read it" bug.
53-
# See https://github.com/python/cpython/issues/151365.
54-
if: github.event_name == 'pull_request'
55-
run: |
56-
sudo apt-get install -y --allow-downgrades 'git=1:2.43.*' 'git-man=1:2.43.*'
57-
git --version
5850
# Adapted from https://github.com/actions/checkout/issues/520#issuecomment-1167205721
5951
- name: 'Fetch commits to get branch diff'
6052
if: github.event_name == 'pull_request'
@@ -94,6 +86,9 @@ jobs:
9486
--fail-if-regression \
9587
--fail-if-improved \
9688
--fail-if-new-news-nit
89+
- name: 'Build list of changes'
90+
run: |
91+
make -C Doc/ PYTHON=../python changes
9792
- name: 'Collect HTML IDs'
9893
if: github.event_name == 'pull_request'
9994
run: python Doc/tools/check-html-ids.py collect Doc/build/html -o Doc/build/html-ids-head.json.gz

‎.github/workflows/reusable-san.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717

1818
env:
1919
FORCE_COLOR: 1
20-
OPENSSL_VER: 3.5.7
20+
OPENSSL_VER: 3.5.8
2121

2222
jobs:
2323
build-san-reusable:

‎.github/workflows/reusable-ubuntu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ${{ inputs.os }}
3636
timeout-minutes: 60
3737
env:
38-
OPENSSL_VER: 3.5.7
38+
OPENSSL_VER: 3.5.8
3939
PYTHONSTRICTEXTENSIONBUILD: 1
4040
TERM: linux
4141
steps:

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,12 @@ Python/frozen_modules/MANIFEST
178178
/python
179179
!/Python/
180180

181-
# People's custom https://docs.anthropic.com/en/docs/claude-code/memory configs.
182-
/.claude/
181+
# Local AI agent scratch state (per-PR and per-branch notebooks, sandbox
182+
# experiments) and personal agent overrides, none of which are committed.
183+
/.claude/pr-*
184+
/.claude/branch-*
185+
/.claude/sandbox/
186+
AGENTS.local.md
183187
CLAUDE.local.md
184188

185189
#### main branch only stuff below this line, things to backport go above. ####

‎AGENTS.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# AI agent guidance
2+
3+
CPython has a [policy on the use of AI tools](https://devguide.python.org/getting-started/ai-tools/).
4+
All use of AI tools and agents when working on or interacting with CPython
5+
must follow it.
6+
7+
> [!important]
8+
> **Primary directive**: Read the policy before making or proposing any changes.
9+
10+
When acting on this repository, apply the policy's core principles:
11+
12+
- Consider whether the change is necessary.
13+
- Make minimal, focused changes.
14+
- Follow existing coding style and patterns.
15+
- Write tests that exercise the change.
16+
- Keep backwards compatibility with prior releases in mind.

0 commit comments

Comments
 (0)