Skip to content

Commit 5ed449f

Browse files
authored
Merge branch 'main' into exec_doco
2 parents cbeaac2 + 41ad2bb commit 5ed449f

File tree

1,289 files changed

+72016
-45313
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,289 files changed

+72016
-45313
lines changed

.github/CODEOWNERS

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
# https://git-scm.com/docs/gitignore#_pattern_format
66

77
# GitHub
8-
.github/** @ezio-melotti @hugovk
8+
.github/** @ezio-melotti @hugovk @AA-Turner
99

1010
# pre-commit
1111
.pre-commit-config.yaml @hugovk @AlexWaygood
12-
.ruff.toml @hugovk @AlexWaygood
12+
.ruff.toml @hugovk @AlexWaygood @AA-Turner
1313

1414
# Build system
1515
configure* @erlend-aasland @corona10
@@ -56,6 +56,14 @@ Tools/c-analyzer/ @ericsnowcurrently
5656
# dbm
5757
**/*dbm* @corona10 @erlend-aasland @serhiy-storchaka
5858

59+
# Doc/ tools
60+
Doc/conf.py @AA-Turner @hugovk
61+
Doc/Makefile @AA-Turner @hugovk
62+
Doc/make.bat @AA-Turner @hugovk
63+
Doc/requirements.txt @AA-Turner @hugovk
64+
Doc/_static/** @AA-Turner @hugovk
65+
Doc/tools/** @AA-Turner @hugovk
66+
5967
# runtime state/lifecycle
6068
**/*pylifecycle* @ericsnowcurrently
6169
**/*pystate* @ericsnowcurrently
@@ -81,23 +89,35 @@ Programs/_bootstrap_python.c @ericsnowcurrently
8189
Programs/python.c @ericsnowcurrently
8290
Tools/build/generate_global_objects.py @ericsnowcurrently
8391

92+
# Initialization
93+
Doc/library/sys_path_init.rst @FFY00
94+
Doc/c-api/init_config.rst @FFY00
95+
96+
# getpath
97+
**/*getpath* @FFY00
98+
99+
# site
100+
**/*site.py @FFY00
101+
Doc/library/site.rst @FFY00
102+
84103
# Exceptions
85104
Lib/test/test_except*.py @iritkatriel
86105
Objects/exceptions.c @iritkatriel
87106

88-
# Hashing
89-
**/*hashlib* @gpshead @tiran
107+
# Hashing & cryptographic primitives
108+
**/*hashlib* @gpshead @tiran @picnixz
90109
**/*pyhash* @gpshead @tiran
91-
**/sha* @gpshead @tiran
92-
Modules/md5* @gpshead @tiran
93-
**/*blake* @gpshead @tiran
110+
**/sha* @gpshead @tiran @picnixz
111+
Modules/md5* @gpshead @tiran @picnixz
112+
**/*blake* @gpshead @tiran @picnixz
94113
Modules/_hacl/** @gpshead
114+
**/*hmac* @gpshead @picnixz
95115

96116
# logging
97117
**/*logging* @vsajip
98118

99119
# venv
100-
**/*venv* @vsajip
120+
**/*venv* @vsajip @FFY00
101121

102122
# Launcher
103123
/PC/launcher.c @vsajip
@@ -281,6 +301,10 @@ Lib/configparser.py @jaraco
281301
Lib/test/test_configparser.py @jaraco
282302

283303
# Doc sections
284-
Doc/reference/ @willingc
304+
Doc/reference/ @willingc @AA-Turner
285305

286306
**/*weakref* @kumaraditya303
307+
308+
# Colorize
309+
Lib/_colorize.py @hugovk
310+
Lib/test/test__colorize.py @hugovk

.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: ["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: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ concurrency:
1818
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-reusable
1919
cancel-in-progress: true
2020

21+
env:
22+
FORCE_COLOR: 1
23+
2124
jobs:
2225
check_source:
2326
name: Change detection
@@ -46,23 +49,24 @@ jobs:
4649
# reproducible: to get the same tools versions (autoconf, aclocal, ...)
4750
runs-on: ubuntu-24.04
4851
container:
49-
image: ghcr.io/python/autoconf:2024.11.11.11786316759
52+
image: ghcr.io/python/autoconf:2025.01.02.12581854023
5053
timeout-minutes: 60
5154
needs: check_source
5255
if: needs.check_source.outputs.run_tests == 'true'
5356
steps:
5457
- name: Install Git
5558
run: |
56-
apt install git -yq
59+
apt update && apt install git -yq
5760
git config --global --add safe.directory "$GITHUB_WORKSPACE"
5861
- uses: actions/checkout@v4
5962
with:
6063
fetch-depth: 1
64+
persist-credentials: false
6165
- name: Runner image version
6266
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
6367
- name: Check Autoconf and aclocal versions
6468
run: |
65-
grep "Generated by GNU Autoconf 2.71" configure
69+
grep "Generated by GNU Autoconf 2.72" configure
6670
grep "aclocal 1.16.5" aclocal.m4
6771
grep -q "runstatedir" configure
6872
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
@@ -94,6 +98,8 @@ jobs:
9498
if: needs.check_source.outputs.run_tests == 'true'
9599
steps:
96100
- uses: actions/checkout@v4
101+
with:
102+
persist-credentials: false
97103
- uses: actions/setup-python@v5
98104
with:
99105
python-version: '3.x'
@@ -120,7 +126,7 @@ jobs:
120126
- name: Build CPython
121127
run: |
122128
make -j4 regen-all
123-
make regen-stdlib-module-names regen-sbom
129+
make regen-stdlib-module-names regen-sbom regen-unicodedata
124130
- name: Check for changes
125131
run: |
126132
git add -u
@@ -150,16 +156,28 @@ jobs:
150156
needs: check_source
151157
if: fromJSON(needs.check_source.outputs.run_tests)
152158
strategy:
159+
fail-fast: false
153160
matrix:
161+
os:
162+
- windows-latest
154163
arch:
155-
- Win32
156-
- x64
157-
- arm64
164+
- x64
158165
free-threading:
159-
- false
160-
- true
166+
- false
167+
- true
168+
include:
169+
- os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
170+
arch: arm64
171+
free-threading: false
172+
- os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64
173+
arch: arm64
174+
free-threading: true
175+
- os: windows-latest
176+
arch: Win32
177+
free-threading: false
161178
uses: ./.github/workflows/reusable-windows.yml
162179
with:
180+
os: ${{ matrix.os }}
163181
arch: ${{ matrix.arch }}
164182
free-threading: ${{ matrix.free-threading }}
165183

@@ -216,17 +234,33 @@ jobs:
216234
name: >-
217235
Ubuntu
218236
${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }}
237+
${{ fromJSON(matrix.bolt) && '(bolt)' || '' }}
219238
needs: check_source
220239
if: needs.check_source.outputs.run_tests == 'true'
221240
strategy:
222241
matrix:
242+
bolt:
243+
- false
244+
- true
223245
free-threading:
224246
- false
225247
- true
248+
os:
249+
- ubuntu-24.04
250+
- ubuntu-24.04-arm
251+
exclude:
252+
# Do not test BOLT with free-threading, to conserve resources
253+
- bolt: true
254+
free-threading: true
255+
# BOLT currently crashes during instrumentation on aarch64
256+
- os: ubuntu-24.04-arm
257+
bolt: true
226258
uses: ./.github/workflows/reusable-ubuntu.yml
227259
with:
228260
config_hash: ${{ needs.check_source.outputs.config_hash }}
261+
bolt-optimizations: ${{ matrix.bolt }}
229262
free-threading: ${{ matrix.free-threading }}
263+
os: ${{ matrix.os }}
230264

231265
build_ubuntu_ssltests:
232266
name: 'Ubuntu SSL tests with OpenSSL'
@@ -238,14 +272,17 @@ jobs:
238272
fail-fast: false
239273
matrix:
240274
os: [ubuntu-24.04]
241-
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
275+
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
276+
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
242277
env:
243278
OPENSSL_VER: ${{ matrix.openssl_ver }}
244279
MULTISSL_DIR: ${{ github.workspace }}/multissl
245280
OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}
246281
LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
247282
steps:
248283
- uses: actions/checkout@v4
284+
with:
285+
persist-credentials: false
249286
- name: Runner image version
250287
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
251288
- name: Restore config.cache
@@ -306,6 +343,8 @@ jobs:
306343
PYTHONSTRICTEXTENSIONBUILD: 1
307344
steps:
308345
- uses: actions/checkout@v4
346+
with:
347+
persist-credentials: false
309348
- name: Register gcc problem matcher
310349
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
311350
- name: Install Dependencies
@@ -389,7 +428,7 @@ jobs:
389428
#
390429
# (GH-104097) test_sysconfig is skipped because it has tests that are
391430
# failing when executed from inside a virtual environment.
392-
${{ env.VENV_PYTHON }} -m test \
431+
"${VENV_PYTHON}" -m test \
393432
-W \
394433
-o \
395434
-j4 \
@@ -424,6 +463,8 @@ jobs:
424463
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
425464
steps:
426465
- uses: actions/checkout@v4
466+
with:
467+
persist-credentials: false
427468
- name: Runner image version
428469
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
429470
- 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)