From 7bcb9b8a09f115253c977e7f8b5980d519a8ae3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pazderka?= <tomas.pazderka@nic.cz>
Date: Fri, 14 Apr 2023 09:05:53 +0200
Subject: [PATCH] Drop old django versions and add new ones

---
 .github/workflows/python-test.yml |  2 +-
 CHANGELOG.md                      |  5 +++++
 setup.py                          |  7 ++++---
 tox.ini                           | 11 ++++++-----
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index f2ff8f5..d051f7d 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python: [3.7, 3.8, 3.9, "3.10"]
+        python: [3.7, 3.8, 3.9, "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b20c90f..ea66fc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog #
+## Unreleased
+ * Removed support for Django 3.0 and 3.1
+ * Added support for Django 4.1 and 4.2
+ * Added support for Python 3.11
+
 ## 1.2.1
  * Fixed metadata lookup for devices with device certificate directly in MDS
 
diff --git a/setup.py b/setup.py
index d35b8b6..8ead6e0 100644
--- a/setup.py
+++ b/setup.py
@@ -10,10 +10,10 @@
 CLASSIFIERS = ['Development Status :: 4 - Beta',
                'License :: OSI Approved :: MIT License',
                'Framework :: Django',
-               'Framework :: Django :: 3.0',
-               'Framework :: Django :: 3.1',
                'Framework :: Django :: 3.2',
                'Framework :: Django :: 4.0',
+               'Framework :: Django :: 4.1',
+               'Framework :: Django :: 4.2',
                'Intended Audience :: Developers',
                'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
                'Operating System :: OS Independent',
@@ -23,11 +23,12 @@
                'Programming Language :: Python :: 3.8',
                'Programming Language :: Python :: 3.9',
                'Programming Language :: Python :: 3.10',
+               'Programming Language :: Python :: 3.11',
                'Topic :: Internet :: WWW/HTTP',
                'Topic :: Security :: Cryptography',
                'Topic :: Software Development :: Libraries :: Python Modules']
 INSTALL_REQUIRES = [
-    'Django>=3.0',
+    'Django>=3.2',
     'fido2~=1.1.0',
     'django-app-settings>=0.7.1',
     'jwcrypto',
diff --git a/tox.ini b/tox.ini
index 8b514fa..786eb11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,10 @@ minversion = 3.15
 isolated_build = True
 envlist =
     py{37,38,39,310}-quality
-    py37-django{30,31,32}-fido{11}
-    py{38,39}-django{30,31,32,40}-fido{11}
-    py310-django{32,40}-fido{11}
+    py37-django{32}-fido{11}
+    py{38,39}-django{32,40,41,42}-fido{11}
+    py310-django{32,40,41,42}-fido{11}
+    py311-django{41,42}-fido{11}
 skip_missing_interpreters = True
 
 [testenv]
@@ -17,10 +18,10 @@ setenv =
 extras = test
 deps =
     coverage
-    django30: django == 3.0.*
-    django31: django == 3.1.*
     django32: django == 3.2.*
     django40: django == 4.0.*
+    django41: django == 4.1.*
+    django42: django == 4.2.*
     fido11: fido2==1.1.*
 commands =
     coverage run --source=django_fido --branch -m django test {posargs:django_fido}