Skip to content

Commit a8fe591

Browse files
serhiy-storchakaserhiy-storchaka
authored
Merge branch 'main' into bpo-45509 
2 parents 64ad8e9 + 4956d2b commit a8fe591

843 files changed

Lines changed: 64132 additions & 20326 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: 5 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,6 +110,7 @@ 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

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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

‎.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/workflows/add-issue-header.yml‎

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

15-
permissions: {}
15+
permissions:
16+
contents: read
1617

1718
jobs:
1819
add-header:

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ on:
1111
- 'main'
1212
- '3.*'
1313

14-
permissions: {}
14+
permissions:
15+
contents: read
1516

1617
concurrency:
1718
# https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#concurrency
@@ -277,13 +278,14 @@ jobs:
277278
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
278279
# supported by important vendors such as AWS-LC.
279280
- { name: openssl, version: 1.1.1w }
280-
- { name: openssl, version: 3.0.19 }
281-
- { name: openssl, version: 3.3.6 }
282-
- { name: openssl, version: 3.4.4 }
283-
- { name: openssl, version: 3.5.5 }
284-
- { name: openssl, version: 3.6.1 }
281+
- { name: openssl, version: 3.0.20 }
282+
- { name: openssl, version: 3.3.7 }
283+
- { name: openssl, version: 3.4.5 }
284+
- { name: openssl, version: 3.5.6 }
285+
- { name: openssl, version: 3.6.2 }
286+
- { name: openssl, version: 4.0.0 }
285287
## AWS-LC
286-
- { name: aws-lc, version: 1.68.0 }
288+
- { name: aws-lc, version: 1.72.1 }
287289
env:
288290
SSLLIB_VER: ${{ matrix.ssllib.version }}
289291
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -353,7 +355,7 @@ jobs:
353355
with:
354356
persist-credentials: false
355357
- name: Build and test
356-
run: ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
358+
run: python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
357359

358360
build-ios:
359361
name: iOS
@@ -397,7 +399,7 @@ jobs:
397399
needs: build-context
398400
if: needs.build-context.outputs.run-ubuntu == 'true'
399401
env:
400-
OPENSSL_VER: 3.5.5
402+
OPENSSL_VER: 3.5.6
401403
PYTHONSTRICTEXTENSIONBUILD: 1
402404
steps:
403405
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -505,7 +507,7 @@ jobs:
505507
matrix:
506508
os: [ubuntu-24.04]
507509
env:
508-
OPENSSL_VER: 3.5.5
510+
OPENSSL_VER: 3.5.6
509511
PYTHONSTRICTEXTENSIONBUILD: 1
510512
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
511513
steps:
@@ -612,6 +614,7 @@ jobs:
612614
needs.build-context.outputs.run-ci-fuzz == 'true'
613615
|| needs.build-context.outputs.run-ci-fuzz-stdlib == 'true'
614616
permissions:
617+
contents: read
615618
security-events: write
616619
strategy:
617620
fail-fast: false

‎.github/workflows/documentation-links.yml‎

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

‎.github/workflows/jit.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ on:
1515
paths: *paths
1616
workflow_dispatch:
1717

18-
permissions: {}
18+
permissions:
19+
contents: read
1920

2021
concurrency:
2122
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -34,6 +35,9 @@ jobs:
3435
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3536
with:
3637
persist-credentials: false
38+
- name: Install dependencies
39+
run: |
40+
sudo ./.github/workflows/posix-deps-apt.sh
3741
- name: Build tier two interpreter
3842
run: |
3943
./configure --enable-experimental-jit=interpreter --with-pydebug
@@ -151,6 +155,9 @@ jobs:
151155
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
152156
with:
153157
python-version: '3.11'
158+
- name: Install dependencies
159+
run: |
160+
sudo ./.github/workflows/posix-deps-apt.sh
154161
- name: Build
155162
run: |
156163
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM_VERSION }}
@@ -187,6 +194,9 @@ jobs:
187194
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
188195
with:
189196
python-version: '3.11'
197+
- name: Install dependencies
198+
run: |
199+
sudo ./.github/workflows/posix-deps-apt.sh
190200
- name: Build
191201
run: |
192202
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM_VERSION }}

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: Lint
22

33
on: [push, pull_request, workflow_dispatch]
44

5-
permissions: {}
5+
permissions:
6+
contents: read
67

78
env:
89
FORCE_COLOR: 1

‎.github/workflows/mypy.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
- "Tools/build/consts_getter.py"
2020
- "Tools/build/deepfreeze.py"
2121
- "Tools/build/generate-build-details.py"
22+
- "Tools/build/generate_levenshtein_examples.py"
2223
- "Tools/build/generate_sbom.py"
2324
- "Tools/build/generate_stdlib_module_names.py"
2425
- "Tools/build/mypy.ini"
@@ -33,7 +34,8 @@ on:
3334
- "Tools/requirements-dev.txt"
3435
workflow_dispatch:
3536

36-
permissions: {}
37+
permissions:
38+
contents: read
3739

3840
env:
3941
PIP_DISABLE_PIP_VERSION_CHECK: 1
@@ -69,7 +71,8 @@ jobs:
6971
persist-credentials: false
7072
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
7173
with:
72-
python-version: "3.13"
74+
python-version: "3.15"
75+
allow-prereleases: true
7376
cache: pip
7477
cache-dependency-path: Tools/requirements-dev.txt
7578
- run: pip install -r Tools/requirements-dev.txt

0 commit comments

Comments
 (0)