From 89c502d62b1fc73e38287148e1f1407e83839598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Wed, 12 Jun 2024 10:35:04 +0100
Subject: [PATCH] Drop python 3.7 support

---
 .github/workflows/ci.yaml   | 2 +-
 Makefile                    | 2 +-
 NEWS                        | 3 +++
 README.rst                  | 2 +-
 fixtures/_fixtures/popen.py | 8 --------
 setup.cfg                   | 3 +--
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 51ed2e6..2ded8aa 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.7", "pypy-3.8", "pypy-3.9"]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.8", "pypy-3.9"]
     steps:
       - name: Checkout source code
         uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index 730fbe6..796ebcb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= python
+PYTHON ?= python3
 
 all: check
 
diff --git a/NEWS b/NEWS
index 3b877d6..3882f0f 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ NEXT
 * Drop support for Python 3.6 (EOL)
   (Stephen Finucane)
 
+* Drop support for Python 3.7 (EOL)
+  (Jelmer Vernooij)
+
 * Add a new ``WarningsFilter`` filter, allowing users to filter warnings as
   part of their tests, before restoring said filters.
   (Stephen Finucane)
diff --git a/README.rst b/README.rst
index c285b29..58d4a9f 100644
--- a/README.rst
+++ b/README.rst
@@ -11,7 +11,7 @@ provided that makes using fixtures that meet the ``Fixtures`` contract in
 Dependencies
 ============
 
-* Python 3.7+
+* Python 3.8+
   This is the base language fixtures is written in and for.
 
 * ``pbr``
diff --git a/fixtures/_fixtures/popen.py b/fixtures/_fixtures/popen.py
index 469fdcc..2821919 100644
--- a/fixtures/_fixtures/popen.py
+++ b/fixtures/_fixtures/popen.py
@@ -153,14 +153,6 @@ def __call__(
         pipesize=_unpassed,
         process_group=_unpassed
     ):
-        # Reject arguments introduced by newer versions of Python in older
-        # versions; this makes it harder to accidentally hide compatibility
-        # problems using test doubles.
-        if sys.version_info < (3, 7) and text is not FakePopen._unpassed:
-            raise TypeError(
-                "FakePopen.__call__() got an unexpected keyword argument "
-                "'text'"
-            )
         if sys.version_info < (3, 9):
             for arg_name in "group", "extra_groups", "user", "umask":
                 if locals()[arg_name] is not FakePopen._unpassed:
diff --git a/setup.cfg b/setup.cfg
index 62a48ff..227a150 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@ description_content_type = text/x-rst; charset=UTF-8
 author = Robert Collins
 author_email = robertc@robertcollins.net
 url = https://github.com/testing-cabal/fixtures
-python_requires = >=3.7
+python_requires = >=3.8
 classifiers =
     Development Status :: 6 - Mature
     Intended Audience :: Developers
@@ -16,7 +16,6 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10