Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.13'
python-version: '3.14'
cache: "pip"
cache-dependency-path: "**/pyproject.toml"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ruff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- uses: actions/checkout@v4

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

- name: Run ruff
working-directory: ./src
run: ruff --output-format=github wagtail_headless_preview
run: ruff check --output-format=github wagtail_headless_preview
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
TOX_TESTENV_PASSENV: FORCE_COLOR
PIP_DISABLE_PIP_VERSION_CHECK: "1"
PIP_NO_PYTHON_VERSION_WARNING: "1"
PYTHON_LATEST: "3.13"
PYTHON_LATEST: "3.14"

jobs:
tests:
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v6.0.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -18,7 +18,7 @@ repos:
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
# keep in sync with .github/workflows/ruff.yml
rev: 'v0.4.4'
rev: 'v0.15.12'
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- Add Django 5.1 and 5.2, Wagtail 7.0 and 7.2 to the test matrix
## Added

- Add support for Python 3.14
- Add support for Django 5.2 LTS and Django 6.0
- Add support for Wagtail 7.0 LTS, 7.3, and 7.4 LTS

## Removed

- Drop support for Python < 3.10
- Drop support for Wagtail < 6.3
- Drop testing for Python 3.8
- Drop support for Python 3.9 (EOL 2025-10-31)
- Drop support for Wagtail < 7.0 and Django 5.0 (both out of upstream support)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be compacted.

@nickmoreton please keep these concise in the future, in all maintenance PRs.


## [0.8] - 2024-02-23

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ Now you can run tests as shown below:
tox -p
```

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

## Credits

Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ classifiers = [
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand All @@ -23,16 +22,16 @@ classifiers = [
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.1",
"Framework :: Django :: 5.2",
"Framework :: Django :: 6.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 6",
"Framework :: Wagtail :: 7",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
]

dynamic = ["version"]
requires-python = ">=3.10"
dependencies = ["Wagtail>=6.3"]
dependencies = ["Wagtail>=7.0"]

[project.optional-dependencies]
testing = [
Expand Down
6 changes: 4 additions & 2 deletions tests/testapp/fixtures/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
],
"path": "0001",
"url_path": "/",
"slug": "root"
"slug": "root",
"locale": 1
}
},

Expand All @@ -30,7 +31,8 @@
"content_type": ["wagtailcore", "page"],
"path": "00010001",
"url_path": "/home/",
"slug": "home"
"slug": "home",
"locale": 1
}
},

Expand Down
20 changes: 10 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
min_version = 4.11

env_list =
python{3.10,3.11}-django4.2-wagtail{6.3,7.0}
python{3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.2}
python3.14-django5.2-wagtail{7.2}
python3.10-django4.2-wagtail7.0
python{3.10,3.11,3.12,3.13,3.14}-django5.2-wagtail{7.0,7.3,7.4}
python{3.14}-django6.0-wagtail{7.4}
Comment thread
nickmoreton marked this conversation as resolved.
Outdated

[gh-actions]
python =
Expand Down Expand Up @@ -33,19 +33,19 @@ extras = testing

deps =
django4.2: Django>=4.2, <5.0
django5.1: Django>=5.1, <5.2
django5.2: Django>=5.2, <5.3
django5.2: Django>=5.2, <6.0
django6.0: Django>=6.0, <6.1

wagtail6.3: wagtail>=6.3, <6.4
wagtail7.0: wagtail>=7.0, <7.1
wagtail7.2: wagtail>=7.2, <7.3
wagtail7.3: wagtail>=7.3, <7.4
wagtail7.4: wagtail>=7.4, <7.5

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

[testenv:coverage-report]
base_python = python3.13
base_python = python3.14
package = skip
deps =
coverage>=7.0,<8.0
Expand All @@ -55,14 +55,14 @@ commands =

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

[testenv:interactive]
package = editable
description = An interactive environment for local testing purposes
base_python = python3.13
base_python = python3.14

commands_pre =
python {toxinidir}/manage.py makemigrations
Expand Down
Loading