Merge pull request #33 from torchbox-forks/support/wagtail-60

Wagtail 6.0

.github/workflows/release.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3
 
@@ -23,7 +23,7 @@ jobs:
         run: python setup.py bdist_wheel sdist
 
       - name: Upload Python packages artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: Python Packages
           path: dist

.github/workflows/test.yml

@@ -12,17 +12,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.11", "3.10", "3.9", "3.8"]
-        django: ["django>=3.2,<3.3", "django>=4.1,<4.2", "django>=4.2,<4.3"]
-        wagtail: ["wagtail>=4.1,<4.2", "wagtail>=5.1,<5.2", "wagtail>=5.2,<5.3"]
+        python: ["3.12", "3.11", "3.10", "3.9", "3.8"]
+        django: ["django>=3.2,<3.3", "django>=4.2,<4.3", "django>=5.0,<5.1"]
+        wagtail: ["wagtail>=5.2,<5.3", "wagtail>=6.0,<6.1"]
         exclude:
-          - python: "3.11"
-            django: django>=3.2,<3.3
-          - django: django>=4.2,<4.3
-            wagtail: wagtail>=4.1,<4.2
+          - django: django>=3.2,<3.3
+            wagtail: wagtail>=6.0,<6.1
+          - python: "3.8"
+            django: django>=5.0,<5.1
+          - python: "3.9"
+            django: django>=5.0,<5.1
+          - python: "3.12"
+            django: django>=4.2,<4.3
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           cache: "pip"
@@ -35,6 +39,6 @@ jobs:
           coverage report
           coverage xml
       - if: ${{ matrix.latest }}
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         with:
-          name: Python 3.9
+          name: Python 3.12

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 default_language_version:
   node: system
-  python: python3.9
+  python: python3.12
 repos:
   - repo: https://github.com/python/black
     rev: 22.3.0

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Add support for Wagtail 6.0
+- Add support for Django 5.0
+- Drop support for Wagtail < 5.2
+
 ## 2.1.0 (2024-03-07)
 
 - Add support for Wagtail 5.1+

setup.py

@@ -23,7 +23,7 @@
     author="Kevin Howbrook",
     author_email="kevin.howbrook@torchbox.com",
     license="BSD",
-    install_requires=["wagtail>=4.1"],
+    install_requires=["wagtail>=5.2"],
     classifiers=[
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
@@ -34,9 +34,10 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Framework :: Wagtail",
-        "Framework :: Wagtail :: 4",
         "Framework :: Wagtail :: 5",
+        "Framework :: Wagtail :: 6",
     ],
     extras_require={"testing": testing_extras, "development": development_extras},
 )

wagtail_jotform/tests/settings.py

@@ -13,7 +13,6 @@
     "wagtail.contrib.routable_page",
     "wagtail.contrib.frontend_cache",
     "wagtail.contrib.settings",
-    "wagtail.contrib.modeladmin",
     "wagtail.contrib.table_block",
     "wagtail.contrib.forms",
     "wagtail.embeds",