Merge pull request #21 from torchbox-forks/support/wagtail-70-maintenance

Wagtail 70 maintenance

Author: marteinn

.github/workflows/main.yml

@@ -8,21 +8,22 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        wagtail-version: ["5.2", "6.2", "6.3"]
-        django-version: ["4.2", "5.0", "5.1"]
+        wagtail-version: ["5.2", "6.3", "6.4", "7.0"]
+        django-version: ["4.2", "5.1", "5.2"]
         exclude:
+          # Don't test django with incompatible python versions
           - python-version: "3.13"
             django-version: "4.2"
-          - python-version: "3.13"
-            django-version: "5.0"
-          - python-version: "3.9"
-            django-version: "5.0"
           - python-version: "3.9"
             django-version: "5.1"
+          - python-version: "3.9"
+            django-version: "5.2"
+          # Don't test wagtail with incompatible django versions
           - wagtail-version: "5.2"
             django-version: "5.1"
-          - wagtail-version: "6.2"
-            django-version: "5.1"
+          - wagtail-version: "5.2"
+            django-version: "5.2"
+
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -33,7 +34,9 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -U .[test]
-        pip install -q wagtail==${{ matrix.wagtail-version }}
+        pip install -q wagtail==${{ matrix.wagtail-version }}.*
+        pip install -q django==${{ matrix.django-version }}.*
+        pip show wagtail django # For debugging purposes
     - name: Run tests
       run: |
         python runtests.py

CHANGELOG.md

@@ -5,9 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
 ### Changed
+- Add CI testing for Wagtail 6.4 & 7.0
+- Add CI testing for Django 5.2
+
 ### Fixed
+
 ### Removed
+- Drop Wagtail testing for 5.0
+- Drop Django testing for 5.0
 
 ## [1.6.0] - 2025-01-26
 ### Added

setup.py

@@ -40,11 +40,12 @@
         "Environment :: Web Environment",
         "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",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",

tests/test_widget.py

@@ -25,5 +25,7 @@ def test_native_color_panel_uses_correct_widget(self):
         color_panel = page.content_panels[1]
         self.assertEqual(color_panel.__class__, NativeColorPanel)
 
-        color_widget = color_panel.get_form_options()["widgets"]["color"]
+        # Bind the panel to the model before calling get_form_options
+        bound_panel = color_panel.bind_to_model(page.__class__)
+        color_widget = bound_panel.get_form_options()["widgets"]["color"]
         self.assertEqual(color_widget.__class__, ColorInputWidget)