From 131cdc8061bf84853803263b4af059460b93a12e Mon Sep 17 00:00:00 2001
From: Wesley van Lee <w.vanlee@lukkien.com>
Date: Thu, 4 Jan 2024 17:07:02 +0100
Subject: [PATCH] Support for Wagtail 5.0, 5.1 and 5.2

---
 .github/workflows/test.yml | 26 ++++++++++++++++++++++++++
 pytest.ini                 |  2 +-
 setup.py                   |  6 +++---
 tox.ini                    | 10 ++++++++--
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6d0b6da..0b7741e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -72,6 +72,32 @@ jobs:
             python-version: '3.10'
           - toxenv: py310-dj41-wt42
             python-version: '3.10'
+          - toxenv: py310-dj42-wt50
+            python-version: '3.10'
+          - toxenv: py310-dj42-wt51
+            python-version: '3.10'
+          - toxenv: py310-dj42-wt52
+            python-version: '3.10'
+
+          - toxenv: py311-dj41-wt40
+            python-version: '3.11'
+          - toxenv: py311-dj41-wt41
+            python-version: '3.11'
+          - toxenv: py311-dj41-wt42
+            python-version: '3.11'
+          - toxenv: py311-dj42-wt50
+            python-version: '3.11'
+          - toxenv: py311-dj42-wt51
+            python-version: '3.11'
+          - toxenv: py311-dj42-wt52
+            python-version: '3.11'
+
+          - toxenv: py311-dj41-wt52
+            python-version: '3.12'
+          - toxenv: py311-dj42-wt52
+            python-version: '3.12'
+          - toxenv: py311-dj50-wt52
+            python-version: '3.12'
 
     services:
       postgres:
diff --git a/pytest.ini b/pytest.ini
index f05ae03..fac569f 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,4 +2,4 @@
 DJANGO_SETTINGS_MODULE=tests.app.settings
 norecursedirs = .tox .git
 testpaths = tests
-python_paths = .
+pythonpaths = .
diff --git a/setup.py b/setup.py
index 7d992a9..d02c8f5 100644
--- a/setup.py
+++ b/setup.py
@@ -11,12 +11,12 @@
 install_requires = [
     'django-model-utils>=4.2,<4.4',
     'django-recaptcha>=3.0,<3.1',
-    'wagtail>=4.0,<4.3',
-    'django>=3.2,<5'
+    'wagtail>=4.0,<5.3',
+    'django>=3.2,<6'
 ]
 
 test_require = [
-    'psycopg2-binary',
+    'psycopg2',
     # Required for test and coverage
     'pytest',
     'pytest-cov',
diff --git a/tox.ini b/tox.ini
index 35e3f2e..1b2fe92 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,9 @@ skip_missing_interpreters = True
 skipsdist = True
 
 envlist =
-    py{38,39,310}-dj{32,40,41}-wt{40,41}
-    py{310}-dj{41}-wt{42}
+    py{38,39,310}-dj{32,40,41,42,50}-wt{40,41,42,50,51,52}
+    py{310,311}-dj{41,42}-wt{42,50,51,52}
+    py{312}-dj{41,42,50}-wt{52}
     isort,flake8,docs
 
 [testenv]
@@ -16,6 +17,8 @@ basepython =
     py38: python3.8
     py39: python3.9
     py310: python3.10
+    py311: python3.11
+    py312: python3.12
 
 deps =
     dj32: django~=3.2
@@ -24,6 +27,9 @@ deps =
     wt40: wagtail~=4.0
     wt41: wagtail~=4.1
     wt42: wagtail~=4.2
+    wt50: wagtail~=5.0
+    wt51: wagtail~=5.1
+    wt52: wagtail~=5.2
 
 setenv =
     DJANGO_SETTINGS_MODULE=tests.app.settings