Merge branch 'main' into feat/model_interfaces_flexibility

Author: ho-tsl

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## [0.29.0] - 2025-07-02
+
+### Added
+
+- Support for Wagtail 7+ ([#425](https://github.com/torchbox/wagtail-grapple/pull/425)) @rachelhsmith
+
 ## [0.28.0] - 2025-02-18
 
 ### Added
@@ -414,7 +420,8 @@
 -   Improve field definition and under-the-hood implementation ([#28](https://github.com/torchbox/wagtail-grapple/pull/28))
 -   Add conditional checks when resolving streamfield type ([#29](https://github.com/torchbox/wagtail-grapple/pull/29))
 
-[unreleased]: https://github.com/torchbox/wagtail-grapple/compare/v0.28.0...HEAD
+[unreleased]: https://github.com/torchbox/wagtail-grapple/compare/v0.29.0...HEAD
+[0.29.0]: https://github.com/torchbox/wagtail-grapple/compare/v0.28.0...v0.29.0
 [0.28.0]: https://github.com/torchbox/wagtail-grapple/compare/v0.27.0...v0.28.0
 [0.27.0]: https://github.com/torchbox/wagtail-grapple/compare/v0.26.0...v0.27.0
 [0.26.0]: https://github.com/torchbox/wagtail-grapple/compare/v0.25.1...v0.26.0

grapple/__init__.py

@@ -1 +1 @@
-__version__ = "0.28.0"
+__version__ = "0.29.0"

pyproject.toml

@@ -28,6 +28,7 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Framework :: Wagtail",
     "Framework :: Wagtail :: 6",
+    "Framework :: Wagtail :: 7",
 ]
 dynamic = ["version"]
 requires-python = ">=3.9"
@@ -40,6 +41,13 @@ dependencies = [
 [project.optional-dependencies]
 testing = [
     "coverage>=7.2.7,<8.0",
+    "flit>=3.8",
+    "factory-boy==3.2.1",
+    "wagtail-factories>=4.1.0",
+    "django-cors-headers==3.4.0",
+    "wagtailmedia>=0.13",
+    "dj-database-url==2.1.0",
+    "psycopg2-binary>=2.9.5,<3.0.0",
 ]
 
 docs = [

tests/requirements.txt

@@ -5,7 +5,7 @@ ruff==0.9.4
 
 # Runtime requirements
 Django>=4.2,<5.1
-wagtail>=6.3,<6.5
+wagtail>=6.3,<8.0
 graphene-django>=3.0.0
 factory-boy==3.2.1
 wagtail-factories>=4.1.0

tox.ini

@@ -2,9 +2,9 @@
 min_version = 4.0
 
 envlist =
-    py{39,310,311,312}-django{42}-wagtail{63,64}
-    py{312}-django{50}-wagtail{63}
-    py{310,311,312,313}-django{51}-wagtail{63,64}
+    py{39,310,311,312}-django{42}-wagtail{63,64,70}
+    py{312}-django{51}-wagtail{63}
+    py{312,313}-django{52}-wagtail{70}
     interactive
 
 [gh-actions]
@@ -34,21 +34,15 @@ setenv =
 
 change_dir = {tox_root}/tests
 
-deps =
-    flit>=3.8
-    coverage>=7.0,<8.0
-    factory-boy==3.2.1
-    wagtail-factories>=4.1.0
-    django-cors-headers==3.4.0
-    wagtailmedia>=0.13
-    dj-database-url==2.1.0
-    psycopg2>=2.9.5,<3.0.0
+extras = testing
 
+deps =
     django42: Django>=4.2,<5.0
     django50: Django>=5.0,<5.1
     django51: Django>=5.1,<5.2
     wagtail63: wagtail>=6.3,<6.4
     wagtail64: wagtail>=6.4,<6.5
+    wagtail70: wagtail>=7.0,<7.1
 
 commands =
     python -m coverage run manage.py test {posargs: -v1} --exclude-tag=needs-custom-settings