From c4e3b5ff41d99a7514b7846287d3e1c868eea1b3 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sun, 28 Jan 2024 16:37:47 +0100
Subject: [PATCH] Add testing for Django 5.0

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 070b6c306..aa40ccc46 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     env:
       COVERAGE_OPTIONS: "-a"
 
diff --git a/setup.py b/setup.py
index a7ba3e8f8..c5475fb40 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Security',
         'Topic :: System :: Systems Administration :: Authentication/Directory',
     ],
diff --git a/tox.ini b/tox.ini
index 94cca80bf..0444de004 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,7 @@
 [tox]
-; Minimum version of Tox
-minversion = 1.8
 envlist =
     py{38,39,310,311}-dj{32,40,41,42}-{normal,yubikey,custom_user,webauthn}
-    py{310,311}-djmain-{normal,yubikey,custom_user,webauthn}
+    py{310,311,312}-dj{50,main}-{normal,yubikey,custom_user,webauthn}
 
 [gh-actions]
 python =
@@ -11,6 +9,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [gh-actions:env]
 DJANGO =
@@ -18,6 +17,7 @@ DJANGO =
     4.0: dj40
     4.1: dj41
     4.2: dj42
+    5.0: dj50
     main: djmain
 VARIANT =
     normal: normal
@@ -38,14 +38,16 @@ basepython =
     py39: python3.9
     py310: python3.10
     py311: python3.11
+    py312: python3.12
 deps =
     dj32: Django<4.0
     dj40: Django<4.1
     dj41: Django<4.2
     dj42: Django<5.0
+    dj50: Django<5.1
     djmain: https://github.com/django/django/archive/main.tar.gz
     yubikey: django-otp-yubikey
-    webauthn: webauthn>=1.2.1,<1.99
+    webauthn: webauthn>=1.11.0,<1.99
     webauthn: -rrequirements_e2e.txt
     coverage
     freezegun