Skip to content

Commit 001b666

Browse files
authored
7.4 LTS maintenance (#77)
* Update support to Python 3.10-3.14, Django 4.2/5.1/5.2/6.0, Wagtail 7.x * Set Page locale key in test fixture * Simplify test matrix Co-authored-by: Dan Braghiș <31622+zerolab@users.noreply.github.com> * Update CHANGELOG
1 parent ef06c1f commit 001b666

9 files changed

Lines changed: 32 additions & 28 deletions

File tree

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
- uses: actions/setup-python@v5
1818
with:
19-
python-version: '3.13'
19+
python-version: '3.14'
2020
cache: "pip"
2121
cache-dependency-path: "**/pyproject.toml"
2222

.github/workflows/ruff.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
- uses: actions/checkout@v4
1717

1818
# Keep in sync with .pre-commit-config.yaml
19-
- run: python -Im pip install --user ruff==0.4.4
19+
- run: python -Im pip install --user ruff==0.15.12
2020

2121
- name: Run ruff
2222
working-directory: ./src
23-
run: ruff --output-format=github wagtail_headless_preview
23+
run: ruff check --output-format=github wagtail_headless_preview

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
TOX_TESTENV_PASSENV: FORCE_COLOR
1919
PIP_DISABLE_PIP_VERSION_CHECK: "1"
2020
PIP_NO_PYTHON_VERSION_WARNING: "1"
21-
PYTHON_LATEST: "3.13"
21+
PYTHON_LATEST: "3.14"
2222

2323
jobs:
2424
tests:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ci:
44

55
repos:
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v4.6.0
7+
rev: v6.0.0
88
hooks:
99
- id: check-added-large-files
1010
- id: check-case-conflict
@@ -18,7 +18,7 @@ repos:
1818
- id: trailing-whitespace
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
2020
# keep in sync with .github/workflows/ruff.yml
21-
rev: 'v0.4.4'
21+
rev: 'v0.15.12'
2222
hooks:
2323
- id: ruff
2424
args: [--fix, --exit-non-zero-on-fix]

CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10-
- Add Django 5.1 and 5.2, Wagtail 7.0 and 7.2 to the test matrix
11-
- Drop support for Python < 3.10
12-
- Drop support for Wagtail < 6.3
10+
## Added
11+
12+
- Add support for Python 3.14, Django 5.2+ and Wagtail 7.0+
13+
14+
## Removed
15+
16+
- Drop support for Python < 3.10, Django < 5.2, Wagtail < 7.0
1317

1418
## [0.8] - 2024-02-23
1519

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ Now you can run tests as shown below:
334334
tox -p
335335
```
336336

337-
or, you can run them for a specific environment `tox -e py311-django4.2-wagtail5.1` or specific test
338-
`tox -e py311-django4.2-wagtail5.0 -- wagtail_headless_preview.tests.test_frontend.TestFrontendViews.test_redirect_on_preview`
337+
or, you can run them for a specific environment `tox -e python3.13-django5.2-wagtail7.4` or specific test
338+
`tox -e python3.13-django5.2-wagtail7.4 -- wagtail_headless_preview.tests.test_frontend.TestFrontendViews.test_redirect_on_preview`
339339

340340
## Credits
341341

pyproject.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,24 @@ classifiers = [
1313
"License :: OSI Approved :: BSD License",
1414
"Programming Language :: Python",
1515
"Programming Language :: Python :: 3",
16-
"Programming Language :: Python :: 3.9",
1716
"Programming Language :: Python :: 3.10",
1817
"Programming Language :: Python :: 3.11",
1918
"Programming Language :: Python :: 3.12",
2019
"Programming Language :: Python :: 3.13",
2120
"Programming Language :: Python :: 3.14",
2221
"Framework :: Django",
2322
"Framework :: Django :: 4.2",
24-
"Framework :: Django :: 5.1",
2523
"Framework :: Django :: 5.2",
24+
"Framework :: Django :: 6.0",
2625
"Framework :: Wagtail",
27-
"Framework :: Wagtail :: 6",
2826
"Framework :: Wagtail :: 7",
2927
"Topic :: Internet :: WWW/HTTP",
3028
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
3129
]
3230

3331
dynamic = ["version"]
3432
requires-python = ">=3.10"
35-
dependencies = ["Wagtail>=6.3"]
33+
dependencies = ["Wagtail>=7.0"]
3634

3735
[project.optional-dependencies]
3836
testing = [

tests/testapp/fixtures/test.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
],
1515
"path": "0001",
1616
"url_path": "/",
17-
"slug": "root"
17+
"slug": "root",
18+
"locale": 1
1819
}
1920
},
2021

@@ -30,7 +31,8 @@
3031
"content_type": ["wagtailcore", "page"],
3132
"path": "00010001",
3233
"url_path": "/home/",
33-
"slug": "home"
34+
"slug": "home",
35+
"locale": 1
3436
}
3537
},
3638

tox.ini

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
min_version = 4.11
33

44
env_list =
5-
python{3.10,3.11}-django4.2-wagtail{6.3,7.0}
6-
python{3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.2}
7-
python3.14-django5.2-wagtail{7.2}
5+
python3.10-django5.2-wagtail7.0
6+
python3.11-django5.2-wagtail7.3
7+
python{3.12,3.13,3.14}-django5.2-wagtail{7.4}
8+
python{3.14}-django6.0-wagtail{7.4}
89

910
[gh-actions]
1011
python =
@@ -32,20 +33,19 @@ set_env =
3233
extras = testing
3334

3435
deps =
35-
django4.2: Django>=4.2, <5.0
36-
django5.1: Django>=5.1, <5.2
37-
django5.2: Django>=5.2, <5.3
36+
django5.2: Django>=5.2, <6.0
37+
django6.0: Django>=6.0, <6.1
3838

39-
wagtail6.3: wagtail>=6.3, <6.4
4039
wagtail7.0: wagtail>=7.0, <7.1
41-
wagtail7.2: wagtail>=7.2, <7.3
40+
wagtail7.3: wagtail>=7.3, <7.4
41+
wagtail7.4: wagtail>=7.4, <7.5
4242

4343
install_command = python -Im pip install -U {opts} {packages}
4444
commands =
4545
python -Im coverage run runtests.py test --deprecation all {posargs: -v 2}
4646

4747
[testenv:coverage-report]
48-
base_python = python3.13
48+
base_python = python3.14
4949
package = skip
5050
deps =
5151
coverage>=7.0,<8.0
@@ -55,14 +55,14 @@ commands =
5555

5656
[testenv:wagtailmain]
5757
description = Test with latest Wagtail main branch
58-
base_python = python3.13
58+
base_python = python3.14
5959
deps =
6060
wagtailmain: git+https://github.com/wagtail/wagtail.git@main#egg=Wagtail
6161

6262
[testenv:interactive]
6363
package = editable
6464
description = An interactive environment for local testing purposes
65-
base_python = python3.13
65+
base_python = python3.14
6666

6767
commands_pre =
6868
python {toxinidir}/manage.py makemigrations

0 commit comments

Comments
 (0)