From cb66c9a28b7b054e7da186f042b2bce16d3b9eef Mon Sep 17 00:00:00 2001
From: Tom Most <twm@freecog.net>
Date: Mon, 1 Jan 2024 21:16:12 -0800
Subject: [PATCH 1/2] Drop support for Python 3.7

---
 .github/workflows/ci.yaml   | 3 +--
 changelog.d/378.removal.rst | 1 +
 tox.ini                     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/378.removal.rst

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3ae94ac3..8e507639 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -72,7 +72,7 @@ jobs:
 
           include:
           # Pythons too old for latest
-          - python-version: "3.7"
+          - python-version: "3.8"
             twisted-version: "lowest"
             experimental: false
 
@@ -119,7 +119,6 @@ jobs:
       shell: python
       run: |
         table = {
-          "3.7": "py37",
           "3.8": "py38",
           "3.9": "py39",
           "3.10": "py310",
diff --git a/changelog.d/378.removal.rst b/changelog.d/378.removal.rst
new file mode 100644
index 00000000..a3cea347
--- /dev/null
+++ b/changelog.d/378.removal.rst
@@ -0,0 +1 @@
+Support for Python 3.7, which has reached end of support, has been dropped.
diff --git a/tox.ini b/tox.ini
index b22c5db0..c43dcf0b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py37-twisted_lowest,
+    py38-twisted_lowest,
     {pypy3,py38,py39,py310,py311,py312}-twisted_latest,
     {pypy3,py38,py39,py310,py311,py312}-twisted_trunk,
     twine, check-manifest, flake8, docs, coverage-report
@@ -72,7 +72,7 @@ commands =
     sphinx-build -b html . html
 
 [testenv:coverage-report]
-depends = pypy3,py37,py38,py39,py310,py311,py312
+depends = pypy3,py38,py39,py310,py311,py312
 commands =
     coverage combine
     coverage report

From 0f9b47fa66e889b33d6640de78bf6a3ac65f36df Mon Sep 17 00:00:00 2001
From: Tom Most <twm@freecog.net>
Date: Mon, 1 Jan 2024 21:21:10 -0800
Subject: [PATCH 2/2] Also drop PyPy 3.8

---
 .github/workflows/ci.yaml   | 8 --------
 changelog.d/378.removal.rst | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8e507639..0f4cd85d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -71,14 +71,6 @@ jobs:
           experimental: [false]
 
           include:
-          # Pythons too old for latest
-          - python-version: "3.8"
-            twisted-version: "lowest"
-            experimental: false
-
-          - python-version: "pypy-3.8"
-            twisted-version: "lowest"
-            experimental: false
 
           # Pythons too new for lowest
           - python-version: "3.11"
diff --git a/changelog.d/378.removal.rst b/changelog.d/378.removal.rst
index a3cea347..33af59ea 100644
--- a/changelog.d/378.removal.rst
+++ b/changelog.d/378.removal.rst
@@ -1 +1 @@
-Support for Python 3.7, which has reached end of support, has been dropped.
+Support for Python 3.7 and PyPy 3.8, which have reached end of support, has been dropped.