Skip to content

Commit 994b1b3

Browse files
committed
Merge remote-tracking branch 'upstream/main' into more-readme-updates
2 parents 9bb9c03 + 2cabea1 commit 994b1b3

17 files changed

+675
-639
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ updates:
88
actions:
99
patterns:
1010
- "*"
11+
cooldown:
12+
default-days: 7
1113

1214
- package-ecosystem: pip
1315
directory: "/"
@@ -19,3 +21,5 @@ updates:
1921
pip:
2022
patterns:
2123
- "*"
24+
cooldown:
25+
default-days: 7

.github/workflows/build-release.yml

Lines changed: 53 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ permissions: {}
4343
# Set from inputs for workflow_dispatch, or set defaults to test push/PR events
4444
env:
4545
GIT_REMOTE: ${{ github.event.inputs.git_remote || 'python' }}
46-
GIT_COMMIT: ${{ github.event.inputs.git_commit || 'ebf955df7a89ed0c7968f79faec1de49f61ed7cb' }}
47-
CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.14.0' }}
46+
GIT_COMMIT: ${{ github.event.inputs.git_commit || 'df793163d5821791d4e7caf88885a2c11a107986' }}
47+
CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.14.2' }}
4848

4949
jobs:
5050
verify-input:
@@ -61,12 +61,12 @@ jobs:
6161
echo "cpython_release: $CPYTHON_RELEASE"
6262
6363
- name: "Checkout python/release-tools"
64-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
64+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6565
with:
6666
persist-credentials: false
6767

6868
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
69-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
69+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7070
with:
7171
persist-credentials: false
7272
repository: "${{ env.GIT_REMOTE }}/cpython"
@@ -81,7 +81,7 @@ jobs:
8181
fi
8282
8383
- name: "Setup Python"
84-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
84+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
8585
with:
8686
python-version: 3.12
8787

@@ -97,20 +97,20 @@ jobs:
9797
- verify-input
9898
steps:
9999
- name: "Checkout python/release-tools"
100-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
100+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
101101
with:
102102
persist-credentials: false
103103

104104
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
105-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
105+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
106106
with:
107107
persist-credentials: false
108108
repository: "${{ env.GIT_REMOTE }}/cpython"
109109
ref: "v${{ env.CPYTHON_RELEASE }}"
110110
path: "cpython"
111111

112112
- name: "Setup Python"
113-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
113+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
114114
with:
115115
python-version: 3.12
116116

@@ -125,7 +125,7 @@ jobs:
125125
python ../release.py --export "$CPYTHON_RELEASE" --skip-docs
126126
127127
- name: "Upload the source artifacts"
128-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
128+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
129129
with:
130130
name: source
131131
path: |
@@ -139,14 +139,14 @@ jobs:
139139
if: fromJSON(needs.verify-input.outputs.build-docs)
140140
steps:
141141
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
142-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
142+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
143143
with:
144144
persist-credentials: false
145145
repository: "${{ env.GIT_REMOTE }}/cpython"
146146
ref: "v${{ env.CPYTHON_RELEASE }}"
147147

148148
- name: "Setup Python"
149-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
149+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
150150
with:
151151
python-version: 3.12
152152

@@ -165,7 +165,7 @@ jobs:
165165
make dist-text
166166
167167
- name: "Upload the docs artifacts"
168-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
168+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
169169
with:
170170
name: docs
171171
path: |
@@ -178,7 +178,7 @@ jobs:
178178
- build-source
179179
steps:
180180
- name: "Download the source artifacts"
181-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
181+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
182182
with:
183183
name: source
184184

@@ -195,7 +195,44 @@ jobs:
195195
make install -j
196196
197197
cd ../installation
198-
./bin/python3 -m test -uall
198+
./bin/python3 -m test -uall -j4
199+
200+
test-docs:
201+
runs-on: ubuntu-24.04
202+
timeout-minutes: 15
203+
needs:
204+
- build-docs
205+
steps:
206+
- name: "Download the docs artifacts"
207+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
208+
with:
209+
name: docs
210+
211+
- name: "Set up Python"
212+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
213+
with:
214+
python-version: "3.x"
215+
216+
- name: "Install epubcheck"
217+
run: python -m pip install epubcheck
218+
219+
- name: "Run epubcheck"
220+
continue-on-error: true
221+
run: |
222+
ls -la
223+
epubcheck "python-$CPYTHON_RELEASE-docs.epub" &> epubcheck.txt
224+
225+
- name: "Show epubcheck output"
226+
run: cat epubcheck.txt
227+
228+
- name: "Check for fatal errors in EPUB"
229+
run: |
230+
if grep -q "^FATAL" epubcheck.txt; then
231+
echo "Fatal errors found in EPUB:"
232+
grep "^FATAL" epubcheck.txt
233+
exit 1
234+
fi
235+
echo "No fatal errors found in EPUB"
199236
200237
build-android:
201238
name: build-android (${{ matrix.arch }})
@@ -217,7 +254,7 @@ jobs:
217254
triplet: ${{ matrix.arch }}-linux-android
218255
steps:
219256
- name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
220-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
257+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
221258
with:
222259
persist-credentials: false
223260
repository: "${{ env.GIT_REMOTE }}/cpython"
@@ -226,7 +263,7 @@ jobs:
226263
- name: Build and test
227264
run: ./Android/android.py ci --fast-ci "$triplet"
228265

229-
- uses: actions/upload-artifact@v5
266+
- uses: actions/upload-artifact@v6
230267
with:
231268
name: ${{ env.triplet }}
232269
path: cross-build/${{ env.triplet }}/dist/*

.github/workflows/lint.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ name: Lint
22

33
on: [push, pull_request, workflow_dispatch]
44

5+
permissions: {}
6+
57
env:
68
FORCE_COLOR: 1
7-
8-
permissions:
9-
contents: read
9+
RUFF_OUTPUT_FORMAT: github
1010

1111
jobs:
1212
lint:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6.0.1
1717
with:
1818
persist-credentials: false
19-
- uses: actions/setup-python@v6
19+
- uses: actions/setup-python@v6.1.0
2020
with:
2121
python-version: "3.x"
2222
cache: pip
23-
- uses: pre-commit/action@v3.0.1
23+
- uses: j178/prek-action@91fd7d7cf70ae1dee9f4f44e7dfa5d1073fe6623 # v1.0.11
2424

2525
- name: Install dependencies
2626
run: |

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
python-version: ["3.12", "3.13"]
17+
python-version: ["3.12", "3.13", "3.14"]
1818
os: [macos-latest, ubuntu-latest]
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2121
with:
2222
persist-credentials: false
23-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
23+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
cache: pip
@@ -31,6 +31,6 @@ jobs:
3131
tox -e py
3232
3333
- name: Upload coverage
34-
uses: codecov/codecov-action@v5
34+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
3535
with:
3636
token: ${{ secrets.CODECOV_ORG_TOKEN }}

.pre-commit-config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.9.6
3+
rev: v0.14.10
44
hooks:
5-
- id: ruff
5+
- id: ruff-check
66
args: [--exit-non-zero-on-fix]
77

88
- repo: https://github.com/psf/black-pre-commit-mirror
9-
rev: 25.1.0
9+
rev: 25.12.0
1010
hooks:
1111
- id: black
1212

1313
- repo: https://github.com/pre-commit/pre-commit-hooks
14-
rev: v5.0.0
14+
rev: v6.0.0
1515
hooks:
1616
- id: check-added-large-files
1717
- id: check-case-conflict
@@ -25,33 +25,33 @@ repos:
2525
- id: trailing-whitespace
2626

2727
- repo: https://github.com/python-jsonschema/check-jsonschema
28-
rev: 0.31.1
28+
rev: 0.36.0
2929
hooks:
3030
- id: check-dependabot
3131
- id: check-github-workflows
3232

3333
- repo: https://github.com/rhysd/actionlint
34-
rev: v1.7.7
34+
rev: v1.7.10
3535
hooks:
3636
- id: actionlint
3737

3838
- repo: https://github.com/woodruffw/zizmor-pre-commit
39-
rev: v1.3.1
39+
rev: v1.19.0
4040
hooks:
4141
- id: zizmor
4242

4343
- repo: https://github.com/tox-dev/pyproject-fmt
44-
rev: v2.5.0
44+
rev: v2.11.1
4545
hooks:
4646
- id: pyproject-fmt
4747

4848
- repo: https://github.com/abravalheri/validate-pyproject
49-
rev: v0.23
49+
rev: v0.24.1
5050
hooks:
5151
- id: validate-pyproject
5252

5353
- repo: https://github.com/tox-dev/tox-ini-fmt
54-
rev: 1.5.0
54+
rev: 1.7.1
5555
hooks:
5656
- id: tox-ini-fmt
5757

0 commit comments

Comments
 (0)