Skip to content

Commit bc849c3

Browse files
erlend-aaslanderlend-aasland
authored
Merge branch 'main' into sqlite/dbm
2 parents d6d7c66 + 46245b0 commit bc849c3

File tree

536 files changed

+16218
-5551
lines changed

Some content is hidden

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

536 files changed

+16218
-5551
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
root = true
22

3-
[*.{py,c,cpp,h,rst,md,yml}]
3+
[*.{py,c,cpp,h,js,rst,md,yml}]
44
trim_trailing_whitespace = true
55
insert_final_newline = true
66
indent_style = space
@@ -11,5 +11,5 @@ indent_size = 4
1111
[*.rst]
1212
indent_size = 3
1313

14-
[*.yml]
14+
[*.{js,yml}]
1515
indent_size = 2

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ Programs/test_frozenmain.h generated
9494
Python/Python-ast.c generated
9595
Python/executor_cases.c.h generated
9696
Python/generated_cases.c.h generated
97+
Python/tier2_redundancy_eliminator_bytecodes.c.h generated
9798
Python/opcode_targets.h generated
9899
Python/stdlib_module_names.h generated
99100
Tools/peg_generator/pegen/grammar_parser.py generated

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ Doc/c-api/stable.rst @encukou
230230
**/*zipfile/_path/* @jaraco
231231

232232
# Argument Clinic
233-
/Tools/clinic/** @erlend-aasland @AlexWaygood
234-
/Lib/test/test_clinic.py @erlend-aasland @AlexWaygood
233+
/Tools/clinic/** @erlend-aasland
234+
/Lib/test/test_clinic.py @erlend-aasland
235235
Doc/howto/clinic.rst @erlend-aasland
236236

237237
# Subinterpreters

‎.github/workflows/build.yml‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ jobs:
131131
- uses: actions/setup-python@v5
132132
with:
133133
python-version: '3.x'
134+
- name: Runner image version
135+
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
134136
- name: Restore config.cache
135-
uses: actions/cache@v3
137+
uses: actions/cache@v4
136138
with:
137139
path: config.cache
138-
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
140+
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
139141
- name: Install Dependencies
140142
run: sudo ./.github/workflows/posix-deps-apt.sh
141143
- name: Add ccache to PATH
@@ -250,19 +252,21 @@ jobs:
250252
strategy:
251253
fail-fast: false
252254
matrix:
253-
openssl_ver: [1.1.1w, 3.0.11, 3.1.3]
255+
openssl_ver: [1.1.1w, 3.0.13, 3.1.5, 3.2.1]
254256
env:
255257
OPENSSL_VER: ${{ matrix.openssl_ver }}
256258
MULTISSL_DIR: ${{ github.workspace }}/multissl
257259
OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}
258260
LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
259261
steps:
260262
- uses: actions/checkout@v4
263+
- name: Runner image version
264+
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
261265
- name: Restore config.cache
262-
uses: actions/cache@v3
266+
uses: actions/cache@v4
263267
with:
264268
path: config.cache
265-
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
269+
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}
266270
- name: Register gcc problem matcher
267271
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
268272
- name: Install Dependencies
@@ -274,7 +278,7 @@ jobs:
274278
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
275279
- name: 'Restore OpenSSL build'
276280
id: cache-openssl
277-
uses: actions/cache@v3
281+
uses: actions/cache@v4
278282
with:
279283
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
280284
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -304,7 +308,7 @@ jobs:
304308
needs: check_source
305309
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
306310
env:
307-
OPENSSL_VER: 3.0.11
311+
OPENSSL_VER: 3.0.13
308312
PYTHONSTRICTEXTENSIONBUILD: 1
309313
steps:
310314
- uses: actions/checkout@v4
@@ -319,7 +323,7 @@ jobs:
319323
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
320324
- name: 'Restore OpenSSL build'
321325
id: cache-openssl
322-
uses: actions/cache@v3
326+
uses: actions/cache@v4
323327
with:
324328
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
325329
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -341,11 +345,13 @@ jobs:
341345
run: mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
342346
- name: Bind mount sources read-only
343347
run: sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
348+
- name: Runner image version
349+
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
344350
- name: Restore config.cache
345-
uses: actions/cache@v3
351+
uses: actions/cache@v4
346352
with:
347353
path: ${{ env.CPYTHON_BUILDDIR }}/config.cache
348-
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
354+
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}
349355
- name: Configure CPython out-of-tree
350356
working-directory: ${{ env.CPYTHON_BUILDDIR }}
351357
run: |
@@ -375,7 +381,7 @@ jobs:
375381
./python -m venv $VENV_LOC && $VENV_PYTHON -m pip install -r ${GITHUB_WORKSPACE}/Tools/requirements-hypothesis.txt
376382
- name: 'Restore Hypothesis database'
377383
id: cache-hypothesis-database
378-
uses: actions/cache@v3
384+
uses: actions/cache@v4
379385
with:
380386
path: ./hypothesis
381387
key: hypothesis-database-${{ github.head_ref || github.run_id }}
@@ -415,16 +421,18 @@ jobs:
415421
needs: check_source
416422
if: needs.check_source.outputs.run_tests == 'true'
417423
env:
418-
OPENSSL_VER: 3.0.11
424+
OPENSSL_VER: 3.0.13
419425
PYTHONSTRICTEXTENSIONBUILD: 1
420426
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
421427
steps:
422428
- uses: actions/checkout@v4
429+
- name: Runner image version
430+
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
423431
- name: Restore config.cache
424-
uses: actions/cache@v3
432+
uses: actions/cache@v4
425433
with:
426434
path: config.cache
427-
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
435+
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}
428436
- name: Register gcc problem matcher
429437
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
430438
- name: Install Dependencies
@@ -440,7 +448,7 @@ jobs:
440448
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
441449
- name: 'Restore OpenSSL build'
442450
id: cache-openssl
443-
uses: actions/cache@v3
451+
uses: actions/cache@v4
444452
with:
445453
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
446454
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

‎.github/workflows/jit.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
name: JIT
22
on:
33
pull_request:
4-
paths: '**jit**'
4+
paths:
5+
- '**jit**'
6+
- 'Python/bytecodes.c'
57
push:
6-
paths: '**jit**'
8+
paths:
9+
- '**jit**'
10+
- 'Python/bytecodes.c'
711
workflow_dispatch:
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
15+
cancel-in-progress: true
16+
817
jobs:
918
jit:
1019
name: ${{ matrix.target }} (${{ matrix.debug && 'Debug' || 'Release' }})
1120
runs-on: ${{ matrix.runner }}
21+
timeout-minutes: 60
1222
strategy:
1323
fail-fast: false
1424
matrix:

‎.github/workflows/require-pr-label.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ permissions:
1111
jobs:
1212
label:
1313
name: DO-NOT-MERGE / unresolved review
14+
if: github.repository_owner == 'python'
1415
runs-on: ubuntu-latest
1516
timeout-minutes: 10
1617

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
timeout-minutes: 60
9090
steps:
9191
- uses: actions/checkout@v4
92-
- uses: actions/cache@v3
92+
- uses: actions/cache@v4
9393
with:
9494
path: ~/.cache/pip
9595
key: ubuntu-doc-${{ hashFiles('Doc/requirements.txt') }}

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,29 @@ on:
1212
jobs:
1313
build_macos:
1414
name: 'build and test'
15-
runs-on: macos-latest
1615
timeout-minutes: 60
1716
env:
1817
HOMEBREW_NO_ANALYTICS: 1
1918
HOMEBREW_NO_AUTO_UPDATE: 1
2019
HOMEBREW_NO_INSTALL_CLEANUP: 1
2120
PYTHONSTRICTEXTENSIONBUILD: 1
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
os: [
25+
"macos-14", # M1
26+
"macos-13", # Intel
27+
]
28+
runs-on: ${{ matrix.os }}
2229
steps:
2330
- uses: actions/checkout@v4
31+
- name: Runner image version
32+
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
2433
- name: Restore config.cache
25-
uses: actions/cache@v3
34+
uses: actions/cache@v4
2635
with:
2736
path: config.cache
28-
key: ${{ github.job }}-${{ runner.os }}-${{ inputs.config_hash }}
37+
key: ${{ github.job }}-${{ matrix.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
2938
- name: Install Homebrew dependencies
3039
run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk
3140
- name: Configure CPython

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 60
1515
runs-on: ubuntu-20.04
1616
env:
17-
OPENSSL_VER: 3.0.11
17+
OPENSSL_VER: 3.0.13
1818
PYTHONSTRICTEXTENSIONBUILD: 1
1919
steps:
2020
- uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
2929
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
3030
- name: 'Restore OpenSSL build'
3131
id: cache-openssl
32-
uses: actions/cache@v3
32+
uses: actions/cache@v4
3333
with:
3434
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
3535
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -52,11 +52,13 @@ jobs:
5252
run: mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
5353
- name: Bind mount sources read-only
5454
run: sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
55+
- name: Runner image version
56+
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
5557
- name: Restore config.cache
56-
uses: actions/cache@v3
58+
uses: actions/cache@v4
5759
with:
5860
path: ${{ env.CPYTHON_BUILDDIR }}/config.cache
59-
key: ${{ github.job }}-${{ runner.os }}-${{ inputs.config_hash }}
61+
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
6062
- name: Configure CPython out-of-tree
6163
working-directory: ${{ env.CPYTHON_BUILDDIR }}
6264
run: ${{ inputs.options }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.1.7
3+
rev: v0.2.0
44
hooks:
55
- id: ruff
66
name: Run Ruff on Lib/test/

0 commit comments

Comments
 (0)