Skip to content

Commit af2a852

Browse files
authored
Merge branch 'main' into zizmor
2 parents 3aed000 + 498d07f commit af2a852

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
with:
1818
persist-credentials: false
1919
- uses: actions/setup-python@v6

.github/workflows/pypi-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121

2222
steps:
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
with:
2525
persist-credentials: false
2626
- uses: actions/setup-python@v6

.github/workflows/tests.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
branch: ["3.14", "3.13", "3.12"]
17+
python-version: ["3.15", "3.14", "3.13", "3.12"]
18+
include:
19+
- python-version: "3.15"
20+
branch: "main"
1821
steps:
19-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2023
with:
2124
persist-credentials: false
2225
- uses: actions/setup-python@v6
2326
with:
24-
python-version: ${{ matrix.branch }}
27+
python-version: ${{ matrix.python-version }}
2528
allow-prereleases: true
2629
cache: pip
2730
- name: Clone docsbuild scripts
@@ -42,16 +45,16 @@ jobs:
4245
--skip-cache-invalidation
4346
--theme "$(pwd)"
4447
--languages en
45-
--branches ${{ matrix.branch }}
46-
${{ matrix.branch == '3.14' && '--select-output no-html' || '' }}
48+
--branches ${{ matrix.branch || matrix.python-version }}
49+
${{ matrix.branch == 'main' && '--select-output no-html' || '' }}
4750
- name: Show logs
4851
if: failure()
4952
run: |
5053
cat ./logs/docsbuild.log
5154
- name: Upload
5255
uses: actions/upload-artifact@v5
5356
with:
54-
name: doc-html-${{ matrix.branch }}
57+
name: doc-html-${{ matrix.python-version }}
5558
path: www/
5659

5760
translations:
@@ -63,7 +66,7 @@ jobs:
6366
# Test minimum supported and latest stable from 3.x series
6467
python-version: ["3.12", "3"]
6568
steps:
66-
- uses: actions/checkout@v5
69+
- uses: actions/checkout@v6
6770
with:
6871
persist-credentials: false
6972
- uses: actions/setup-python@v6

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ classifiers = [
2222
"Programming Language :: Python :: 3.12",
2323
"Programming Language :: Python :: 3.13",
2424
"Programming Language :: Python :: 3.14",
25+
"Programming Language :: Python :: 3.15",
2526
"Topic :: Documentation",
2627
"Topic :: Software Development :: Documentation",
2728
]
@@ -70,4 +71,4 @@ lint.ignore = [
7071
lint.isort.required-imports = [ "from __future__ import annotations" ]
7172

7273
[tool.pyproject-fmt]
73-
max_supported_python = "3.14"
74+
max_supported_python = "3.15"

0 commit comments

Comments
 (0)