From 62c7fd6c2d3eee9e7fb7d461e1273193b78b6f13 Mon Sep 17 00:00:00 2001
From: John Whitlock <jwhitlock@mozilla.com>
Date: Thu, 18 Aug 2022 13:41:44 -0500
Subject: [PATCH 1/2] Add Django 4.1 to test matrix

---
 setup.py                         | 1 +
 tests/constraints/django-4.1.txt | 1 +
 tests/django/settings.py         | 2 ++
 tox.ini                          | 7 ++++---
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 tests/constraints/django-4.1.txt

diff --git a/setup.py b/setup.py
index 0fbece6..e05b33f 100644
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@ def read(*parts):
         "Framework :: Django",
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
         "Framework :: Flask",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
diff --git a/tests/constraints/django-4.1.txt b/tests/constraints/django-4.1.txt
new file mode 100644
index 0000000..a0aaa8b
--- /dev/null
+++ b/tests/constraints/django-4.1.txt
@@ -0,0 +1 @@
+Django>=4.1,<4.2
diff --git a/tests/django/settings.py b/tests/django/settings.py
index 875e136..341b3f3 100644
--- a/tests/django/settings.py
+++ b/tests/django/settings.py
@@ -66,3 +66,5 @@
     },
     "loggers": {"request.summary": {"handlers": ["console"], "level": "DEBUG"}},
 }
+
+USE_TZ = True  # Default False until Django 5.0, when it switches to True
diff --git a/tox.ini b/tox.ini
index 378e2a4..e367ed0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist =
     py38-lint
     py38-docs
     py{37,38,39,310}-dj32
-    py{38,39,310}-dj{40}
+    py{38,39,310}-dj{40,41}
     py{37,38,39,310}-fl{012,10,11,20,21}
     py{37,38,39}-s20
     py{37,38,39,310}-s{21,22}
@@ -25,12 +25,13 @@ setenv =
     PYTHONPATH = {toxinidir}
 deps =
     -rtests/requirements/default.txt
-    dj{32,40}: -rtests/requirements/django.txt
+    dj{32,40,41}: -rtests/requirements/django.txt
     fl{012,10,11,20,21}: -rtests/requirements/flask.txt
     s20: -rtests/requirements/sanic-20.txt
     s{21,22}: -rtests/requirements/sanic.txt
     dj32: -ctests/constraints/django-3.2.txt
     dj40: -ctests/constraints/django-4.0.txt
+    dj41: -ctests/constraints/django-4.1.txt
     fl012: -ctests/constraints/flask-0.12.txt
     fl10: -ctests/constraints/flask-1.0.txt
     fl11: -ctests/constraints/flask-1.1.txt
@@ -41,7 +42,7 @@ deps =
     s22: -ctests/constraints/sanic-22.txt
 commands =
     python --version
-    dj{32,40}: pytest tests/core/ tests/django --nomigrations {posargs:}
+    dj{32,40,41}: pytest tests/core/ tests/django --nomigrations {posargs:}
     fl{012,10,11,20,21}: pytest tests/core/ tests/flask/ {posargs:}
     s{20,21,22}: pytest tests/core/ tests/sanic/ {posargs:}
 

From c88d4f49fab1edbeaabff57b4e69b6473f01a03a Mon Sep 17 00:00:00 2001
From: John Whitlock <jwhitlock@mozilla.com>
Date: Thu, 18 Aug 2022 13:55:15 -0500
Subject: [PATCH 2/2] Add Flask 2.2 to test matrix, fix Flask 2.1

The Flask 2.1 test was actually testing Flask 2.0
---
 tests/constraints/flask-2.2.txt | 1 +
 tox.ini                         | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 tests/constraints/flask-2.2.txt

diff --git a/tests/constraints/flask-2.2.txt b/tests/constraints/flask-2.2.txt
new file mode 100644
index 0000000..1e7ae79
--- /dev/null
+++ b/tests/constraints/flask-2.2.txt
@@ -0,0 +1 @@
+Flask>=2.2,<2.3
diff --git a/tox.ini b/tox.ini
index e367ed0..b28cbcb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ envlist =
     py38-docs
     py{37,38,39,310}-dj32
     py{38,39,310}-dj{40,41}
-    py{37,38,39,310}-fl{012,10,11,20,21}
+    py{37,38,39,310}-fl{012,10,11,20,21,22}
     py{37,38,39}-s20
     py{37,38,39,310}-s{21,22}
 
@@ -26,7 +26,7 @@ setenv =
 deps =
     -rtests/requirements/default.txt
     dj{32,40,41}: -rtests/requirements/django.txt
-    fl{012,10,11,20,21}: -rtests/requirements/flask.txt
+    fl{012,10,11,20,21,22}: -rtests/requirements/flask.txt
     s20: -rtests/requirements/sanic-20.txt
     s{21,22}: -rtests/requirements/sanic.txt
     dj32: -ctests/constraints/django-3.2.txt
@@ -36,14 +36,15 @@ deps =
     fl10: -ctests/constraints/flask-1.0.txt
     fl11: -ctests/constraints/flask-1.1.txt
     fl20: -ctests/constraints/flask-2.0.txt
-    fl21: -ctests/constraints/flask-2.0.txt
+    fl21: -ctests/constraints/flask-2.1.txt
+    fl22: -ctests/constraints/flask-2.2.txt
     s20: -ctests/constraints/sanic-20.txt
     s21: -ctests/constraints/sanic-21.txt
     s22: -ctests/constraints/sanic-22.txt
 commands =
     python --version
     dj{32,40,41}: pytest tests/core/ tests/django --nomigrations {posargs:}
-    fl{012,10,11,20,21}: pytest tests/core/ tests/flask/ {posargs:}
+    fl{012,10,11,20,21,22}: pytest tests/core/ tests/flask/ {posargs:}
     s{20,21,22}: pytest tests/core/ tests/sanic/ {posargs:}
 
 [testenv:py38-docs]