Skip to content
Open
Show file tree
Hide file tree
Changes from all 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/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]

steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

Wagtail 7.0 and 7.1 upgrade changes:

- Add tox testing for Django 5.2 and Wagtail 7.0, 7.1
- Drop testing for Django 5.0
- Drop testing for Wagtail 5.2 and 6.4

Wagtail 6.3 upgrade changes:

- Add tox testing for Django 5.1 and Wagtail 6.3
- Drop testing for Python 3.8
Comment on lines +10 to 19
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Wagtail 7.0 and 7.1 upgrade changes:
- Add tox testing for Django 5.2 and Wagtail 7.0, 7.1
- Drop testing for Django 5.0
- Drop testing for Wagtail 5.2 and 6.4
Wagtail 6.3 upgrade changes:
- Add tox testing for Django 5.1 and Wagtail 6.3
- Drop testing for Python 3.8
- Add Django 5.1 and 5.2, Wagtail 7.0 and 7.2 to the test matrix
- Drop support for Python < 3.10
- Drop support for Wagtail < 6.3


Expand Down
7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,21 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Framework :: Django",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Django :: 5.1",
"Framework :: Django :: 5.2",
"Framework :: Wagtail",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
"Framework :: Wagtail :: 7",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
]

dynamic = ["version"]
requires-python = ">=3.9"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
requires-python = ">=3.9"
requires-python = ">=3.10"

dependencies = ["Wagtail>=5.2"]
dependencies = ["Wagtail>=6.3"]

[project.optional-dependencies]
testing = [
Expand Down
3 changes: 3 additions & 0 deletions runtests.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python

import argparse
import os
import sys
Expand All @@ -7,6 +8,8 @@
from django.core.management import execute_from_command_line


# Ensure the tests directory is in sys.path for Django import
sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings"


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

env_list =
python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.3,6.4}
python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.3,6.4}
python{3.12,3.13}-django5.1-wagtail{6.3,6.4}
python{3.10,3.11,3.12}-django4.2-wagtail{6.3,7.0,7.2}
python{3.10,3.11,3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.2}
python3.14-django5.2-wagtail{7.0,7.2}
Comment on lines +5 to +7
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
python{3.10,3.11,3.12}-django4.2-wagtail{6.3,7.0,7.2}
python{3.10,3.11,3.12,3.13}-django{5.1,5.2}-wagtail{6.3,7.0,7.2}
python3.14-django5.2-wagtail{7.0,7.2}
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}


[gh-actions]
python =
3.9: python3.9
3.10: python3.10
3.11: python3.11
3.12: python3.12
3.13: python3.13
3.14: python3.14

[testenv]
package = wheel
Expand All @@ -33,12 +33,12 @@ extras = testing

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

wagtail5.2: wagtail>=5.2, <6.0
wagtail6.3: wagtail>=6.3, <6.4
wagtail6.4: wagtail>=6.4, <6.5
wagtail7.0: wagtail>=7.0, <7.1
wagtail7.2: wagtail>=7.2, <7.3

install_command = python -Im pip install -U {opts} {packages}
commands =
Expand Down