Merge pull request #173 from nicoddemus/drop-py37-add-py310-plus

Drop Python 3.7, add Python 3.10, 3.11, and 3.12

Author: nicoddemus

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.7", "3.8", "3.9"]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, windows-latest]
 
     steps:

docs/changelog.rst

@@ -3,10 +3,16 @@
 Changelog
 =========
 
+UNRELEASED
+----------
+
+* Added support for Python 3.10, 3.11, and 3.12.
+* Dropped support for EOL Python 3.7.
+
 1.3.0 (2023-10-23)
 ------------------
 
-- Fix compatibility with ``Flask 3.0`` -- the consequence is that the deprecated and incompatible ``request_ctx`` has been removed.
+- Fixed compatibility with ``Flask 3.0`` -- the consequence is that the deprecated and incompatible ``request_ctx`` has been removed.
 
 1.2.1
 ------------------

setup.cfg

@@ -19,9 +19,11 @@ classifiers=
     Environment :: Web Environment
     Intended Audience :: Developers
     Operating System :: OS Independent
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     License :: OSI Approved :: MIT License
     Topic :: Software Development :: Testing
     Development Status :: 5 - Production/Stable
@@ -30,7 +32,7 @@ classifiers=
 [options]
 packages = pytest_flask
 zip_safe = False
-python_requires = >= 3.7
+python_requires = >= 3.8
 setup_requires = setuptools_scm
 package_dir =
     =src

setup.py

@@ -1,22 +1,13 @@
 #!/usr/bin/env python
-import os
+from pathlib import Path
 
 from setuptools import setup
 
-
-def read(*parts):
-    """Reads the content of the file located at path created from *parts*."""
-    try:
-        return open(os.path.join(*parts), "r", encoding="utf-8").read()
-    except OSError:
-        return ""
-
-
 tests_require = []
-requirements = read("requirements", "main.txt").splitlines()
+requirements = Path("requirements/main.txt").read_text(encoding="UTF-8").splitlines()
 extras_require = {
-    "docs": read("requirements", "docs.txt").splitlines(),
-    "tests": tests_require,
+    "docs": Path("requirements/docs.txt").read_text(encoding="UTF-8").splitlines(),
+    "tests": [tests_require],
 }
 
 setup(

src/pytest_flask/live_server.py

@@ -61,7 +61,7 @@ def _is_ready(self):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             sock.connect((self.host, self.port))
-        except socket.error:
+        except OSError:
             ret = False
         else:
             ret = True

src/pytest_flask/plugin.py

@@ -37,7 +37,7 @@ def pytest_assertrepr_compare(op, left, right):
                 left.status_code,
                 right,
             ),
-            "Response status: {}".format(left.status),
+            f"Response status: {left.status}",
         ]
     return None
 

tests/test_live_server.py

@@ -11,7 +11,7 @@ class TestLiveServer:
     def test_init(self, live_server):
         assert live_server.port
         assert live_server.host == "localhost"
-        assert live_server.url() == "http://localhost:{0}".format(live_server.port)
+        assert live_server.url() == f"http://localhost:{live_server.port}"
 
     def test_server_is_alive(self, live_server):
         assert live_server._process