From 12c697b6675b6c43b04ad2218009df415e577adf Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Thu, 15 Jun 2023 15:07:02 +0200
Subject: [PATCH] Add Django 4.2 to test matrix and classifiers

---
 .github/workflows/ci.yml | 8 +++++++-
 changelog.d/668.misc     | 1 +
 setup.cfg                | 7 +++++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/668.misc

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ced03f92..1b5bee6c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,7 @@ jobs:
           - '3.2'
           - '4.0'
           - '4.1'
+          - '4.2'
         redis-version:
           - 'latest'
 
@@ -43,8 +44,13 @@ jobs:
             redis-version: 'latest'
             python-version: '3.11'
 
+          # Django 4.2 and python 3.11 with latest redis
+          - django-version: '4.2'
+            redis-version: 'latest'
+            python-version: '3.11'
+
           # latest Django with pre-release redis
-          - django-version: '4.1'
+          - django-version: '4.2'
             redis-version: 'master'
             python-version: '3.11'
 
diff --git a/changelog.d/668.misc b/changelog.d/668.misc
new file mode 100644
index 00000000..6c146efa
--- /dev/null
+++ b/changelog.d/668.misc
@@ -0,0 +1 @@
+Run actions & tox against Django 4..2
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 3c76f354..9395f819 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ classifiers =
     Framework :: Django :: 3.2
     Framework :: Django :: 4.0
     Framework :: Django :: 4.1
+    Framework :: Django :: 4.2
     Intended Audience :: Developers
     License :: OSI Approved :: BSD License
     Operating System :: OS Independent
@@ -72,9 +73,9 @@ envlist =
     isort
     mypy
     # tests against released versions
-    py{36,37,38,39,310,311}-dj{22,31,32,40,41}-redislatest
+    py{36,37,38,39,310,311}-dj{22,31,32,40,41,42}-redislatest
     # tests against unreleased versions
-    py311-dj41-redismaster
+    py311-dj42-redismaster
     py311-djmain-redis{latest,master}
 
 [gh-actions]
@@ -91,6 +92,7 @@ DJANGO =
     3.2: dj32
     4.0: dj40
     4.1: dj41
+    4.2: dj42
     main: djmain
 REDIS =
     latest: redislatest
@@ -116,6 +118,7 @@ deps =
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0,<4.1
     dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<5.0
     djmain: https://github.com/django/django/archive/main.tar.gz
     msgpack>=0.6.0
     pytest