Drop support for Wagtail <5.2, Django <4.2

.github/workflows/nightly-tests.yml

@@ -16,7 +16,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:12
+        image: postgres:14
         env:
           POSTGRES_PASSWORD: postgres
         ports:
@@ -25,15 +25,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install "psycopg2>=2.6"
-          pip install "Django>=4.2,<4.3"
+          pip install "psycopg>=3.2"
+          pip install "Django>=5.1,<5.2"
           pip install "git+https://github.com/wagtail/wagtail.git@main#egg=wagtail"
           pip install -e .
       - name: Test

.github/workflows/test.yml

@@ -6,11 +6,11 @@ on:
   pull_request:
 
 # Current configuration:
-# - django 3.2, python 3.8, wagtail 4.1, sqlite
-# - django 4.1, python 3.9, wagtail 5.0, postgresql
-# - django 4.2, python 3.10, wagtail 5.1, sqlite
-# - django 4.2, python 3.11, wagtail 5.2, postgresql
-# - django 4.1, python 3.11, wagtail main, postgres (allow failures)
+# - django 4.2, python 3.8, wagtail 5.2, sqlite
+# - django 4.2, python 3.9, wagtail 6.0, postgresql
+# - django 5.0, python 3.11, wagtail 6.1, sqlite
+# - django 5.1, python 3.12, wagtail 6.2, postgresql
+# - django 5.1, python 3.12, wagtail main, postgres (allow failures)
 jobs:
   test:
     runs-on: ubuntu-20.04
@@ -19,37 +19,37 @@ jobs:
       matrix:
         include:
           - python: "3.8"
-            django: "Django>=3.2,<3.3"
-            wagtail: "wagtail>=4.1,<4.2"
+            django: "Django>=4.2,<4.3"
+            wagtail: "wagtail>=5.2,<5.3"
             database: "sqlite3"
             experimental: false
           - python: "3.9"
-            django: "Django>=4.1,<4.2"
-            wagtail: "wagtail>=5.0,<5.1"
+            django: "Django>=4.2,<4.3"
+            wagtail: "wagtail>=6.0,<6.1"
             database: "postgresql"
-            psycopg: "psycopg2>=2.6"
+            psycopg: "psycopg>=3.2"
             experimental: false
-          - python: "3.10"
-            django: "Django>=4.2,<4.3"
-            wagtail: "wagtail>=5.1,<5.2"
+          - python: "3.11"
+            django: "Django>=5.0,<5.1"
+            wagtail: "wagtail>=6.1,<6.2"
             database: "sqlite3"
             experimental: false
-          - python: "3.11"
-            django: "Django>=4.2,<4.3"
-            wagtail: "wagtail>=5.2,<5.3"
+          - python: "3.12"
+            django: "Django>=5.1,<5.2"
+            wagtail: "wagtail>=6.2,<6.3"
             database: "postgresql"
-            psycopg: "psycopg2>=2.6"
+            psycopg: "psycopg>=3.2"
             experimental: false
-          - python: "3.11"
-            django: "Django>=4.2,<4.3"
+          - python: "3.12"
+            django: "Django>=5.1,<5.2"
             wagtail: "git+https://github.com/wagtail/wagtail.git@main#egg=wagtail"
             database: "postgresql"
-            psycopg: "psycopg2>=2.6"
+            psycopg: "psycopg>=3.2"
             experimental: true
 
     services:
       postgres:
-        image: postgres:12
+        image: postgres:14
         env:
           POSTGRES_PASSWORD: postgres
         ports:

CHANGELOG.txt

@@ -1,3 +1,10 @@
+0.5 (xxxx-xx-xx)
+----------------
+
+* Fixes for Wagtail 6.x (Matt Westcott)
+* Dropped support for Wagtail <5.2, Django <4.2
+
+
 0.4 (2023-08-01)
 ----------------
 

README.md

@@ -6,7 +6,7 @@ An extension for Wagtail allowing pages to be submitted for review (including to
 
 ## Requirements
 
-Wagtail 4.1 or higher
+Wagtail 5.2 or higher
 
 ## Installation
 

setup.py

@@ -29,12 +29,13 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Framework :: Django',
-        'Framework :: Django :: 3',
         'Framework :: Django :: 4',
+        'Framework :: Django :: 5',
         'Framework :: Wagtail',
-        'Framework :: Wagtail :: 3',
         'Framework :: Wagtail :: 4',
         'Framework :: Wagtail :: 5',
+        'Framework :: Wagtail :: 6',
     ],
 )