From 55ce6ea93e229b9f10701543f83cb943e93dd683 Mon Sep 17 00:00:00 2001
From: zerolab <dan@zerolab.org>
Date: Mon, 6 Nov 2023 21:07:20 +0000
Subject: [PATCH] Tidy up the test matrix

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 58840dd3b..3d2b49951 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11']
+        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
         database: ['sqlite']
 
     steps:
@@ -54,13 +54,15 @@ jobs:
           python -m pip install tox tox-gh-actions
       - name: Test with tox
         run: tox -- -v1
+        env:
+          DATABASE: sqlite
 
   test-postgres:
     runs-on: ubuntu-latest
     needs: lint
     strategy:
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11']
+        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
         database: ['postgres']
 
     services:
@@ -96,11 +98,8 @@ jobs:
         id: test-with-tox
         run: tox -- -v1
         env:
-          DB_NAME: postgres
-          DB_USER: postgres
-          DB_PASSWORD: postgres
-          DB_HOST: localhost
-          DB_PORT: 5432
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
+          DATABASE: postgres
 
   coverage:
     runs-on: ubuntu-latest
diff --git a/tox.ini b/tox.ini
index 9805e51fd..c4db8ad0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,8 @@ usedevelop = True
 
 envlist =
     python{3.8,3.9,3.10}-django{3.2,4.1}-wagtail{4.1}-{sqlite,postgres12}
-    python{3.11}-django{4.1}-wagtail{4.1,5.0,5.1}-{sqlite,postgres15}
-    python{3.8,3.9,3.10,3.11}-django{4.2}-wagtail{5.0,5.1}-{sqlite,postgres15}
+    python{3.8,3.9,3.10,3.11}-django{4.2}-wagtail{5.1,5.2}-{sqlite,postgres15}
+    python{3.12}-django{4.2}-wagtail{5.2}-{sqlite,postgres15}
 
 [gh-actions]
 python =
@@ -13,6 +13,7 @@ python =
     3.9: python3.9
     3.10: python3.10
     3.11: python3.11
+    3.12: python3.12
 
 [gh-actions:env]
 DATABASE =
@@ -34,11 +35,11 @@ deps =
     django3.2: Django>=3.2,<3.3
     django4.1: Django>=4.1,<4.2
     django4.2: Django>=4.2,<5.0
-    djangomain: git+https://github.com/django/django.git@main#egg=Django
 
     wagtail4.1: wagtail>=4.1,<4.2
     wagtail5.0: wagtail>=5.0,<5.1
     wagtail5.1: wagtail>=5.1,<5.2
+    wagtail5.2: wagtail>=5.2,<5.3
     wagtailmain: git+https://github.com/wagtail/wagtail.git
 
     # Pinned to work around UTC connection error
@@ -50,7 +51,7 @@ setenv =
 
 
 [testenv:interactive]
-basepython = python3.9
+basepython = python3.11
 
 commands_pre =
     python {toxinidir}/testmanage.py makemigrations