Skip to content

Commit 5c5cbf9

Browse files
authored
Merge pull request #40 from torchbox-forks/support/wagtail-70-upgrade
Wagtail v7.0 maintenance
2 parents a391c8d + 1a5c39a commit 5c5cbf9

File tree

4 files changed

+52
-23
lines changed

4 files changed

+52
-23
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,30 @@ jobs:
1313
strategy:
1414
matrix:
1515
python: ["3.13", "3.12", "3.11", "3.10", "3.9"]
16-
django: ["django>=4.2,<4.3", "django>=5.0,<5.1", "django>=5.1,<5.2"]
16+
django: ["django>=4.2,<4.3", "django>=5.1,<5.2", "django>=5.2,<5.3"]
1717
wagtail:
1818
[
1919
"wagtail>=5.2,<5.3",
20-
"wagtail>=6.0,<6.1",
21-
"wagtail>=6.1,<6.2",
22-
"wagtail>=6.2,<6.3",
2320
"wagtail>=6.3,<6.4",
21+
"wagtail>=6.4,<6.5",
22+
"wagtail>=7.0,<7.1",
2423
]
2524
exclude:
26-
- python: "3.9"
27-
django: "django>=5.0,<5.1"
28-
- python: "3.9"
29-
django: "django>=5.1,<5.2"
25+
# Python 3.13 is not compatible with Django 4.2
3026
- python: "3.13"
3127
django: "django>=4.2,<4.3"
32-
- python: "3.13"
33-
django: "django>=5.0,<5.1"
34-
- python: "3.13"
28+
29+
# Django 5.1/5.2 with Wagtail 5.2 combinations are excluded for all Python versions
30+
- django: "django>=5.1,<5.2"
3531
wagtail: "wagtail>=5.2,<5.3"
36-
- python: "3.13"
37-
wagtail: "wagtail>=6.0,<6.1"
38-
- python: "3.13"
39-
wagtail: "wagtail>=6.1,<6.2"
40-
- python: "3.13"
32+
- django: "django>=5.2,<5.3"
33+
wagtail: "wagtail>=5.2,<5.3"
34+
4135
include:
4236
- python: "3.13"
43-
django: "django>=5.1,<5.2"
44-
wagtail: "wagtail>=6.4,<6.5"
37+
django: "django>=5.2,<5.3"
38+
wagtail: "wagtail>=7.0,<7.1"
39+
latest: true
4540
steps:
4641
- uses: actions/checkout@v4
4742
- uses: actions/setup-python@v5

CHANGELOG.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
## [Unreleased]
1010

11-
- Add support/testing for Wagtail 6.1, 6.2, 6.3 and 6.4
12-
- Add support/testing for Django 5.0 & 5.1
11+
- Add support/testing for Wagtail 6.3, 6.4 and 7.0
12+
- Add support/testing for Django 5.1 and 5.2
1313
- Drop testing for Django < 4.2
14-
- Drop support for Python < 3.8
15-
- Add support for Python 3.13
14+
- Drop support for Python < 3.9
15+
- Add support for Python 3.9, 3.10, 3.11, 3.12 and 3.13
16+
- Add tox configuration for local testing
1617

1718
## 2.2.0 (2024-03-07)
1819

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
99
long_description = f.read()
1010

11-
testing_extras = ["coverage>=6.4.1", "tox-poetry>=0.4.1"]
11+
testing_extras = ["coverage>=6.4.1", "tox>=4.11.0"]
1212
development_extras = ["black", "isort", "flake8", "pre-commit"]
1313

1414
setup(

tox.ini

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[tox]
2+
skipsdist = True
3+
usedevelop = True
4+
skip_missing_interpreters = True
5+
6+
envlist =
7+
python{39,310,311,312}-django{42}-wagtail{52,63,64,70}
8+
python{39,310,311,312}-django{51,52}-wagtail{63,64,70}
9+
python313-django{51,52}-wagtail{63,64,70}
10+
11+
[testenv]
12+
install_command = pip install -e ".[testing]" -U {opts} {packages}
13+
14+
commands =
15+
coverage run ./runtests.py
16+
coverage report
17+
18+
deps =
19+
django42: Django>=4.2,<4.3
20+
django51: Django>=5.1,<5.2
21+
django52: Django>=5.2,<5.3
22+
wagtail52: wagtail>=5.2,<5.3
23+
wagtail63: wagtail>=6.3,<6.4
24+
wagtail64: wagtail>=6.4,<6.5
25+
wagtail70: wagtail>=7.0,<7.1
26+
coverage
27+
28+
basepython =
29+
py39: python3.9
30+
py310: python3.10
31+
py311: python3.11
32+
py312: python3.12
33+
py313: python3.13

0 commit comments

Comments
 (0)