From 5cc174842a7651b1a88280a693614bc7ecc0b3db Mon Sep 17 00:00:00 2001
From: Dan Braghis <dan.braghis@torchbox.com>
Date: Wed, 26 Jan 2022 13:00:13 +0000
Subject: [PATCH] Test against Django 4.0 (and Wagtail main)

---
 .github/workflows/test.yml | 5 +++++
 setup.py                   | 2 +-
 tox.ini                    | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f032b23a..1602747a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -84,6 +84,11 @@ jobs:
             wagtail: 'main'
             postgres: '10.8'
             experimental: true
+          - python: '3.10'
+            django: '4.0'
+            wagtail: 'main'
+            postgres: '10.8'
+            experimental: true
     services:
       postgres:
         image: postgres:${{ matrix.postgres }}
diff --git a/setup.py b/setup.py
index 4beffe62..02466317 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@
         "Framework :: Wagtail",
         "Framework :: Wagtail :: 2",
     ],
-    install_requires=["Django>=2.2,<4.0", "Wagtail>=2.11,<2.17", "polib>=1.1,<2.0"],
+    install_requires=["Django>=2.2,<4.1", "Wagtail>=2.11,<2.17", "polib>=1.1,<2.0"],
     extras_require={
         "testing": ["dj-database-url==0.5.0", "freezegun==1.1.0"],
         "documentation": [
diff --git a/tox.ini b/tox.ini
index 9716179e..9f784f91 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,8 @@ usedevelop = True
 envlist =
     python{3.7,3.8,3.9}-django{2.2}-wagtail{2.11,2.12,2.13}-{sqlite,postgres}
     python{3.7,3.8,3.9}-django{3.2}-wagtail{2.14,2.15,2.16}-{sqlite,postgres}
-    python{3.7,3.8,3.9}-django{4.0}-wagtail2.16-{sqlite,postgres}
-    python{3.10}-dj{3.2,main}-wagtail{2.15,2.16,main}-{sqlite,postgres}
+    python{3.7,3.8,3.9,3.10}-django{4.0}-wagtail{2.16,main}-{sqlite,postgres}
+    python{3.10}-django{3.2,main}-wagtail{2.15,2.16,main}-{sqlite,postgres}
 
 [flake8]
 # E501: Line too long