From 669940a2cc87c68ec2045249e61d8a63c8427a0a Mon Sep 17 00:00:00 2001
From: "nick.moreton" <nick.moreton@torchbox.com>
Date: Tue, 8 Nov 2022 13:02:12 +0000
Subject: [PATCH] Drop Wagtail < 2.15 and Django < 3.2

---
 setup.py | 23 +++++++++++++----------
 tox.ini  | 20 +++++++++-----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/setup.py b/setup.py
index 24e12ad..678c4ab 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import re
 from setuptools import find_packages, setup
 
 install_requires = [
-    "wagtail>=2.9,<4.0",
+    "wagtail>=2.15,<4.2",
     "user-agents>=2.2.0",
     "wagtailfontawesome>=1.2.1",
     "pycountry",
@@ -36,12 +36,12 @@ with open("README.rst") as fh:
     )
 
 setup(
-    name='wagtail-personalisation',
-    version='0.15.3',
-    description='A Wagtail add-on for showing personalized content',
-    author='Lab Digital BV and others',
-    author_email='opensource@labdigital.nl',
-    url='https://labdigital.nl/',
+    name="wagtail-personalisation",
+    version="0.15.3",
+    description="A Wagtail add-on for showing personalized content",
+    author="Lab Digital BV and others",
+    author_email="opensource@labdigital.nl",
+    url="https://labdigital.nl/",
     install_requires=install_requires,
     tests_require=tests_require,
     extras_require={
@@ -64,10 +64,13 @@ setup(
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Framework :: Django",
-        "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.0",
-        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 3",
+        "Framework :: Django :: 4",
+        "Framework :: Wagtail :: 2",
+        "Framework :: Wagtail :: 3",
+        "Framework :: Wagtail :: 4",
         "Topic :: Internet :: WWW/HTTP :: Site Management",
     ],
 )
diff --git a/tox.ini b/tox.ini
index 45f24e3..bfc9d68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,37 +1,35 @@
 [tox]
 envlist =
     flake8
-    py{37,38}-dj{22}-wt{211,212,213}
-    py{37,38,39}-dj{30,31}-wt{211,212,213}
-    py{37,38,39}-dj{30,31,32}-wt{214,215}
-    py{39}-dj{32,40}-wt{216,30}
+    py{37,38,39,310,311}-dj{32}-wt{214,215}
+    py{38,39,310,311}-dj{32,40}-wt{216,30,40,41}
 
 [gh-actions]
 python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
+    3.11: py311
 
 [testenv]
 basepython =
     py37: python3.7
     py38: python3.8
     py39: python3.9
+    py310: python3.10
+    py311: python3.11
 commands = coverage run --parallel -m pytest -rs {posargs}
 extras = test
 deps =
-    dj22: Django>=2.2.8,<2.3
-    dj30: Django>=3.0,<3.1
-    dj31: Django>=3.1,<3.2
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0,<4.1
-    wt211: wagtail>=2.11,<2.12
-    wt212: wagtail>=2.12,<2.13
-    wt213: wagtail>=2.13,<2.14
-    wt214: wagtail>=2.14,<2.15
+    dj41: Django>=4.1,<4.2
     wt215: wagtail>=2.15,<2.16
     wt216: wagtail>=2.16,<2.17
     wt30: wagtail>=3.0,<4.0
+    wt40: wagtail>=4.0,<4.1
+    wt41: wagtail>=4.1,<4.2
     geoip2: geoip2
 
 [testenv:coverage-report]