Skip to content

Commit 45017a9

Browse files
authored
Merge branch 'main' into sem-macosx-multiprocessing-module-C
2 parents 9c8b9cb + f5c7535 commit 45017a9

621 files changed

Lines changed: 34538 additions & 10409 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Include/internal/pycore_uop_ids.h generated
8484
Include/internal/pycore_uop_metadata.h generated
8585
Include/opcode.h generated
8686
Include/opcode_ids.h generated
87+
Include/slots_generated.h generated
8788
Include/token.h generated
8889
Lib/_opcode_metadata.py generated
8990
Lib/idlelib/help.html generated
@@ -99,7 +100,6 @@ Lib/token.py generated
99100
Misc/sbom.spdx.json generated
100101
Modules/_testinternalcapi/test_cases.c.h generated
101102
Modules/_testinternalcapi/test_targets.h generated
102-
Objects/typeslots.inc generated
103103
PC/python3dll.c generated
104104
Parser/parser.c generated
105105
Parser/token.c generated
@@ -110,6 +110,7 @@ Python/generated_cases.c.h generated
110110
Python/optimizer_cases.c.h generated
111111
Python/opcode_targets.h generated
112112
Python/record_functions.c.h generated
113+
Python/slots_generated.c generated
113114
Python/stdlib_module_names.h generated
114115
Tools/peg_generator/pegen/grammar_parser.py generated
115116
aclocal.m4 generated

.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/build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,14 @@ jobs:
278278
# unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
279279
# supported by important vendors such as AWS-LC.
280280
- { name: openssl, version: 1.1.1w }
281-
- { name: openssl, version: 3.0.19 }
282-
- { name: openssl, version: 3.3.6 }
283-
- { name: openssl, version: 3.4.4 }
284-
- { name: openssl, version: 3.5.5 }
285-
- { 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 }
286287
## AWS-LC
287-
- { name: aws-lc, version: 1.68.0 }
288+
- { name: aws-lc, version: 1.72.1 }
288289
env:
289290
SSLLIB_VER: ${{ matrix.ssllib.version }}
290291
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -398,7 +399,7 @@ jobs:
398399
needs: build-context
399400
if: needs.build-context.outputs.run-ubuntu == 'true'
400401
env:
401-
OPENSSL_VER: 3.5.5
402+
OPENSSL_VER: 3.5.6
402403
PYTHONSTRICTEXTENSIONBUILD: 1
403404
steps:
404405
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -506,7 +507,7 @@ jobs:
506507
matrix:
507508
os: [ubuntu-24.04]
508509
env:
509-
OPENSSL_VER: 3.5.5
510+
OPENSSL_VER: 3.5.6
510511
PYTHONSTRICTEXTENSIONBUILD: 1
511512
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
512513
steps:

.github/workflows/documentation-links.yml

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

.github/workflows/jit.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ jobs:
3535
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3636
with:
3737
persist-credentials: false
38+
- name: Install dependencies
39+
run: |
40+
sudo ./.github/workflows/posix-deps-apt.sh
3841
- name: Build tier two interpreter
3942
run: |
4043
./configure --enable-experimental-jit=interpreter --with-pydebug
@@ -152,6 +155,9 @@ jobs:
152155
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
153156
with:
154157
python-version: '3.11'
158+
- name: Install dependencies
159+
run: |
160+
sudo ./.github/workflows/posix-deps-apt.sh
155161
- name: Build
156162
run: |
157163
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM_VERSION }}
@@ -188,6 +194,9 @@ jobs:
188194
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
189195
with:
190196
python-version: '3.11'
197+
- name: Install dependencies
198+
run: |
199+
sudo ./.github/workflows/posix-deps-apt.sh
191200
- name: Build
192201
run: |
193202
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM_VERSION }}

.github/workflows/mypy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ jobs:
7171
persist-credentials: false
7272
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
7373
with:
74-
python-version: "3.13"
74+
python-version: "3.15"
75+
allow-prereleases: true
7576
cache: pip
7677
cache-dependency-path: Tools/requirements-dev.txt
7778
- run: pip install -r Tools/requirements-dev.txt

.github/workflows/posix-deps-apt.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,16 @@ apt-get -yq --no-install-recommends install \
2626
xvfb \
2727
zlib1g-dev
2828

29-
# Workaround missing libmpdec-dev on ubuntu 24.04:
30-
# https://launchpad.net/~ondrej/+archive/ubuntu/php
31-
# https://deb.sury.org/
32-
sudo add-apt-repository ppa:ondrej/php
33-
apt-get update
34-
apt-get -yq --no-install-recommends install libmpdec-dev
29+
# Workaround missing libmpdec-dev on ubuntu 24.04 by building mpdecimal
30+
# from source. ppa:ondrej/php (launchpad.net) are unreliable
31+
# (https://status.canonical.com) so fetch the tarball directly
32+
# from the upstream host.
33+
# https://www.bytereef.org/mpdecimal/
34+
MPDECIMAL_VERSION=4.0.1
35+
curl -fsSL "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${MPDECIMAL_VERSION}.tar.gz" \
36+
| tar -xz -C /tmp
37+
(cd "/tmp/mpdecimal-${MPDECIMAL_VERSION}" \
38+
&& ./configure --prefix=/usr/local \
39+
&& make -j"$(nproc)" \
40+
&& make install)
41+
ldconfig

.github/workflows/reusable-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
python-version: '3'
5858
cache: 'pip'
59-
cache-dependency-path: 'Doc/requirements.txt'
59+
cache-dependency-path: 'Doc/pylock.toml'
6060
- name: 'Install build dependencies'
6161
run: make -C Doc/ venv
6262

.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.5
38+
OPENSSL_VER: 3.5.6
3939
PYTHONSTRICTEXTENSIONBUILD: 1
4040
TERM: linux
4141
steps:

0 commit comments

Comments
 (0)