From e3a6e1b05330399ed3313e91ce8340263c3630f0 Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.es>
Date: Mon, 23 May 2022 12:11:55 +0200
Subject: [PATCH] Updated Python support and dependencies.

---
 CHANGELOG.txt | 13 +++++++++++++
 setup.cfg     |  1 +
 setup.py      |  5 ++---
 tox.ini       |  6 +-----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8463751..7e6a120 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,16 @@
+Unreleased
+----------
+
+* Dropped support for Python 3.6.
+
+* Updated dependencies to the latest versions.
+
+  Previously a range of Twisted versions have been supported. Recent Twisted
+  releases (22.2, 22.4) have issued security fixes, so those are now the
+  minimum supported version. Given the stability of Twisted, supporting a
+  range of versions does not represent a good use of maintainer time. Going
+  forward the latest Twisted version will be required.
+
 3.0.2 (2021-04-07)
 ------------------
 
diff --git a/setup.cfg b/setup.cfg
index ddb3d5d..e7c19e5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,3 +8,4 @@ profile = black
 
 [tool:pytest]
 testpaths = tests
+asyncio_mode = strict
diff --git a/setup.py b/setup.py
index 214df0d..274e8f8 100755
--- a/setup.py
+++ b/setup.py
@@ -22,8 +22,8 @@ setup(
     package_dir={"twisted": "daphne/twisted"},
     packages=find_packages() + ["twisted.plugins"],
     include_package_data=True,
-    install_requires=["twisted[tls]>=19.7", "autobahn>=0.18", "asgiref>=3.2.10,<4"],
-    python_requires=">=3.6",
+    install_requires=["twisted[tls]>=22.4", "autobahn>=22.4.2", "asgiref>=3.5.2,<4"],
+    python_requires=">=3.7",
     setup_requires=["pytest-runner"],
     extras_require={"tests": ["hypothesis", "pytest", "pytest-asyncio"]},
     entry_points={
@@ -37,7 +37,6 @@ setup(
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
diff --git a/tox.ini b/tox.ini
index da7d4d9..876ff99 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,8 @@
 [tox]
 envlist =
-    py{36,37,38,39,310}-twisted{197,latest}
-
+    py{37,38,39,310}
 [testenv]
 usedevelop = true
 extras = tests
 commands =
     pytest -v {posargs}
-deps =
-    twisted187: twisted==19.7.0
-    twistedlatest: twisted>=20.3.0