From 48189a5f776609374e4837ec0e34dfa78e8f7413 Mon Sep 17 00:00:00 2001
From: Dan Braghis <dan.braghis@torchbox.com>
Date: Mon, 12 Sep 2022 10:33:49 +0100
Subject: [PATCH] Ensure Wagtail 4.0 is in the tox test targets

---
 .github/workflows/test.yml | 22 ++++++++++++++--------
 tox.ini                    |  9 ++++++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 74b7876a..5f772ce2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,6 +46,9 @@ jobs:
           - python: '3.9'
             django: '3.2'
             wagtail: '3.0'
+          - python: '3.9'
+            django: '3.2'
+            wagtail: '4.0'
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python }}
@@ -76,43 +79,46 @@ jobs:
         python: ['3.7', '3.8', '3.9']
         django: ['2.2']
         wagtail: ['2.11', '2.12', '2.13']
-        postgres: ['10.8']
         experimental: [false]
         include:
           # Add test for Django 3.2 that is only suported on Wagtail 2.13+
           - python: '3.9'
             django: '3.2'
             wagtail: '2.14'
-            postgres: '10.8'
             experimental: false
           - python: '3.9'
             django: '3.2'
             wagtail: '2.15'
-            postgres: '10.8'
             experimental: false
           - python: '3.9'
             django: '3.2'
             wagtail: '2.16'
-            postgres: '10.8'
             experimental: false
           - python: '3.9'
             django: '4.0'
             wagtail: '2.16'
-            postgres: '10.8'
             experimental: false
           - python: '3.9'
             django: '3.2'
             wagtail: '3.0'
-            postgres: '10.8'
             experimental: false
           - python: '3.9'
             django: '4.0'
             wagtail: '3.0'
-            postgres: '10.8'
+            experimental: false
+          - python: '3.9'
+            django: '4.0'
+            wagtail: '4.0'
+            experimental: false
+          - python: '3.9'
+            django: '4.1'
+            wagtail: '4.0'
             experimental: false
     services:
       postgres:
-        image: postgres:${{ matrix.postgres }}
+        image: ${{ matrix.postgres || 'postgres:11' }}
+        env:
+          POSTGRES_PASSWORD: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
diff --git a/tox.ini b/tox.ini
index 8a95b441..6806104d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,10 @@ 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,3.0}-{sqlite,postgres}
-    python{3.7,3.8,3.9,3.10}-django{4.0}-wagtail{2.16,3.0,main}-{sqlite,postgres}
-    python{3.10}-django{3.2,main}-wagtail{2.15,2.16,3.0,main}-{sqlite,postgres}
+    python{3.7,3.8,3.9}-django{3.2}-wagtail{2.14,2.15,2.16,3.0,4.0}-{sqlite,postgres}
+    python{3.7,3.8,3.9,3.10}-django{4.0}-wagtail{2.16,3.0,4.0,main}-{sqlite,postgres}
+    python{3.10}-django{3.2}-wagtail{2.15,2.16,3.0,4.0,main}-{sqlite,postgres}
+    python{3.8, 3.9, 3.10}-django{4.1,main}-wagtail{4.0,main}-{sqlite,postgres}
 
 [flake8]
 # E501: Line too long
@@ -31,6 +32,7 @@ deps =
     django2.2: Django~=2.2
     django3.2: Django~=3.2
     django4.0: Django~=4.0
+    django4.1: Django~=4.1
     djangomain: git+https://github.com/django/django.git@main#egg=Django
 
     wagtail2.11: wagtail>=2.11,<2.12
@@ -40,6 +42,7 @@ deps =
     wagtail2.15: wagtail>=2.15,<2.16
     wagtail2.16: wagtail>=2.16,<2.17
     wagtail3.0: wagtail>=3.0,<4.0
+    wagtail4.0: wagtail>=4.0,<5.0
     wagtailmain: git+https://github.com/wagtail/wagtail.git
 
     # Pinned to work around UTC connection error