From 700ea46607928e3ade827511d25b220938a402fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksi=20H=C3=A4kli?= <aleksi.hakli@iki.fi>
Date: Fri, 28 Apr 2023 13:08:17 +0300
Subject: [PATCH] Adjust GitHub and tox matrix to match current version support
 state

---
 .github/workflows/test.yml | 24 +++++++++++++-----------
 pyproject.toml             |  6 ++++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 164960f..9ad1ea9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,35 +13,37 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.8']
-        django-version: ['3.2', '4.0', '4.1']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        django-version: ['3.2', '4.1', '4.2']
         include:
           # Tox configuration for QA environment
-          - python-version: '3.10'
+          - python-version: '3.11'
             django-version: 'qa'
           # Django main
-          - python-version: '3.10'
-            django-version: 'main'
-            experimental: true
           - python-version: '3.11'
             django-version: 'main'
             experimental: true
+          # PyPy 3.8
+          - python-version: 'pypy-3.8'
+            django-version: '3.2'
+            experimental: true
           - python-version: 'pypy-3.8'
             django-version: '4.1'
             experimental: true
+          - python-version: 'pypy-3.8'
+            django-version: '4.2'
+            experimental: true
         exclude:
-          # Exclude Python 3.7 for Django 4.0 and Django main
-          - python-version: '3.7'
-            django-version: '4.0'
+          # Exclude Python 3.7 for Django 4.x and Django main
           - python-version: '3.7'
             django-version: '4.1'
+          - python-version: '3.7'
+            django-version: '4.2'
           - python-version: '3.7'
             django-version: 'main'
           # Exclude Python 3.11 for Django 3.2 and Django 4.0
           - python-version: '3.11'
             django-version: '3.2'
-          - python-version: '3.11'
-            django-version: '4.0'
 
 
     steps:
diff --git a/pyproject.toml b/pyproject.toml
index a4201c8..070e2c5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,8 +13,8 @@ envlist =
     py{37,38,39,310,py38}-dj32
     py{38,39,310,311,py38}-dj41
     py{38,39,310,311,py38}-dj42
-    py{310,311,py38}-djmain
-    py310-djqa
+    py311-djmain
+    py311-djqa
 
 [gh-actions]
 python =
@@ -48,8 +48,10 @@ setenv =
 # Django development version is allowed to fail the test matrix
 ignore_outcome =
     djmain: True
+    pypy38: True
 ignore_errors =
     djmain: True
+    pypy38: True
 
 # QA runs type checks, linting, and code formatting checks
 [testenv:py311-djqa]