Skip to content

Commit fc01695

Browse files
authored
Merge branch 'main' into fix-issue-126349
2 parents 815a8a3 + ffece55 commit fc01695

File tree

1,075 files changed

+39622
-16016
lines changed

Some content is hidden

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

1,075 files changed

+39622
-16016
lines changed

.azure-pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
displayName: Pre-build checks
66

77
pool:
8-
vmImage: ubuntu-22.04
8+
vmImage: ubuntu-24.04
99

1010
steps:
1111
- template: ./prebuild-checks.yml

.github/CODEOWNERS

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@ configure* @erlend-aasland @corona10
1616
Makefile.pre.in @erlend-aasland
1717
Modules/Setup* @erlend-aasland
1818

19+
# argparse
20+
**/*argparse* @savannahostrowski
21+
1922
# asyncio
2023
**/*asyncio* @1st1 @asvetlov @kumaraditya303 @willingc
2124

2225
# Core
2326
**/*context* @1st1
2427
**/*genobject* @markshannon
2528
**/*hamt* @1st1
26-
**/*jit* @brandtbucher
29+
**/*jit* @brandtbucher @savannahostrowski
2730
Objects/set* @rhettinger
2831
Objects/dict* @methane @markshannon
2932
Objects/typevarobject.c @JelleZijlstra
@@ -78,6 +81,17 @@ Programs/_bootstrap_python.c @ericsnowcurrently
7881
Programs/python.c @ericsnowcurrently
7982
Tools/build/generate_global_objects.py @ericsnowcurrently
8083

84+
# Initialization
85+
Doc/library/sys_path_init.rst @FFY00
86+
Doc/c-api/init_config.rst @FFY00
87+
88+
# getpath
89+
**/*getpath* @FFY00
90+
91+
# site
92+
**/*site.py @FFY00
93+
Doc/library/site.rst @FFY00
94+
8195
# Exceptions
8296
Lib/test/test_except*.py @iritkatriel
8397
Objects/exceptions.c @iritkatriel
@@ -94,7 +108,7 @@ Modules/_hacl/** @gpshead
94108
**/*logging* @vsajip
95109

96110
# venv
97-
**/*venv* @vsajip
111+
**/*venv* @vsajip @FFY00
98112

99113
# Launcher
100114
/PC/launcher.c @vsajip

.github/actionlint.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
self-hosted-runner:
2+
labels: ["ubuntu-24.04-aarch64", "windows-aarch64"]
3+
4+
config-variables: null
5+
6+
paths:
7+
.github/workflows/**/*.yml:
8+
ignore:
9+
- 1st argument of function call is not assignable
10+
- SC2(015|038|086|091|097|098|129|155)

.github/workflows/build.yml

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,19 @@ jobs:
4646
# reproducible: to get the same tools versions (autoconf, aclocal, ...)
4747
runs-on: ubuntu-24.04
4848
container:
49-
image: ghcr.io/python/autoconf:2024.10.16.11360930377
49+
image: ghcr.io/python/autoconf:2024.11.11.11786316759
5050
timeout-minutes: 60
5151
needs: check_source
5252
if: needs.check_source.outputs.run_tests == 'true'
5353
steps:
5454
- name: Install Git
5555
run: |
56-
apt install git -yq
56+
apt update && apt install git -yq
5757
git config --global --add safe.directory "$GITHUB_WORKSPACE"
5858
- uses: actions/checkout@v4
5959
with:
6060
fetch-depth: 1
61+
persist-credentials: false
6162
- name: Runner image version
6263
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
6364
- name: Check Autoconf and aclocal versions
@@ -76,7 +77,7 @@ jobs:
7677
# Check for changes in regenerated files
7778
if test -n "$changes"; then
7879
echo "Generated files not up to date."
79-
echo "Perhaps you forgot to run make regen-all or build.bat --regen. ;)"
80+
echo "Perhaps you forgot to run make regen-configure ;)"
8081
echo "configure files must be regenerated with a specific version of autoconf."
8182
echo "$changes"
8283
echo ""
@@ -88,12 +89,14 @@ jobs:
8889
name: 'Check if generated files are up to date'
8990
# Don't use ubuntu-latest but a specific version to make the job
9091
# reproducible: to get the same tools versions (autoconf, aclocal, ...)
91-
runs-on: ubuntu-22.04
92+
runs-on: ubuntu-24.04
9293
timeout-minutes: 60
9394
needs: check_source
9495
if: needs.check_source.outputs.run_tests == 'true'
9596
steps:
9697
- uses: actions/checkout@v4
98+
with:
99+
persist-credentials: false
97100
- uses: actions/setup-python@v5
98101
with:
99102
python-version: '3.x'
@@ -120,7 +123,7 @@ jobs:
120123
- name: Build CPython
121124
run: |
122125
make -j4 regen-all
123-
make regen-stdlib-module-names regen-sbom
126+
make regen-stdlib-module-names regen-sbom regen-unicodedata
124127
- name: Check for changes
125128
run: |
126129
git add -u
@@ -150,16 +153,28 @@ jobs:
150153
needs: check_source
151154
if: fromJSON(needs.check_source.outputs.run_tests)
152155
strategy:
156+
fail-fast: false
153157
matrix:
158+
os:
159+
- windows-latest
154160
arch:
155-
- Win32
156-
- x64
157-
- arm64
161+
- x64
158162
free-threading:
159-
- false
160-
- true
163+
- false
164+
- true
165+
include:
166+
- os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
167+
arch: arm64
168+
free-threading: false
169+
- os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
170+
arch: arm64
171+
free-threading: true
172+
- os: windows-latest
173+
arch: Win32
174+
free-threading: false
161175
uses: ./.github/workflows/reusable-windows.yml
162176
with:
177+
os: ${{ matrix.os }}
163178
arch: ${{ matrix.arch }}
164179
free-threading: ${{ matrix.free-threading }}
165180

@@ -223,10 +238,19 @@ jobs:
223238
free-threading:
224239
- false
225240
- true
241+
os:
242+
- ubuntu-24.04
243+
- ubuntu-24.04-aarch64
244+
is-fork: # only used for the exclusion trick
245+
- ${{ github.repository_owner != 'python' }}
246+
exclude:
247+
- os: ubuntu-24.04-aarch64
248+
is-fork: true
226249
uses: ./.github/workflows/reusable-ubuntu.yml
227250
with:
228251
config_hash: ${{ needs.check_source.outputs.config_hash }}
229252
free-threading: ${{ matrix.free-threading }}
253+
os: ${{ matrix.os }}
230254

231255
build_ubuntu_ssltests:
232256
name: 'Ubuntu SSL tests with OpenSSL'
@@ -237,15 +261,18 @@ jobs:
237261
strategy:
238262
fail-fast: false
239263
matrix:
240-
os: [ubuntu-22.04]
241-
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
264+
os: [ubuntu-24.04]
265+
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
266+
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
242267
env:
243268
OPENSSL_VER: ${{ matrix.openssl_ver }}
244269
MULTISSL_DIR: ${{ github.workspace }}/multissl
245270
OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}
246271
LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
247272
steps:
248273
- uses: actions/checkout@v4
274+
with:
275+
persist-credentials: false
249276
- name: Runner image version
250277
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
251278
- name: Restore config.cache
@@ -297,7 +324,7 @@ jobs:
297324

298325
test_hypothesis:
299326
name: "Hypothesis tests on Ubuntu"
300-
runs-on: ubuntu-22.04
327+
runs-on: ubuntu-24.04
301328
timeout-minutes: 60
302329
needs: check_source
303330
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
@@ -306,6 +333,8 @@ jobs:
306333
PYTHONSTRICTEXTENSIONBUILD: 1
307334
steps:
308335
- uses: actions/checkout@v4
336+
with:
337+
persist-credentials: false
309338
- name: Register gcc problem matcher
310339
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
311340
- name: Install Dependencies
@@ -389,7 +418,7 @@ jobs:
389418
#
390419
# (GH-104097) test_sysconfig is skipped because it has tests that are
391420
# failing when executed from inside a virtual environment.
392-
${{ env.VENV_PYTHON }} -m test \
421+
"${VENV_PYTHON}" -m test \
393422
-W \
394423
-o \
395424
-j4 \
@@ -417,13 +446,15 @@ jobs:
417446
if: needs.check_source.outputs.run_tests == 'true'
418447
strategy:
419448
matrix:
420-
os: [ubuntu-22.04]
449+
os: [ubuntu-24.04]
421450
env:
422451
OPENSSL_VER: 3.0.15
423452
PYTHONSTRICTEXTENSIONBUILD: 1
424453
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
425454
steps:
426455
- uses: actions/checkout@v4
456+
with:
457+
persist-credentials: false
427458
- name: Runner image version
428459
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
429460
- name: Restore config.cache

.github/workflows/documentation-links.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ on:
1010
- 'Doc/**'
1111
- '.github/workflows/doc.yml'
1212

13-
permissions:
14-
pull-requests: write
15-
1613
concurrency:
1714
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1815
cancel-in-progress: true
1916

2017
jobs:
2118
documentation-links:
2219
runs-on: ubuntu-latest
20+
permissions:
21+
pull-requests: write
22+
2323
steps:
2424
- uses: readthedocs/actions/preview@v1
2525
with:

0 commit comments

Comments
 (0)