Merge pull request #68 from kevin1024/configure-pre-commit

drop support for Python 3.6 with pyupgrade and other pre-commit tools

Author: graingert

.github/workflows/main.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, '3.10']
+        python-version: [3.7, 3.8, 3.9, "3.10"]
         os: [macOS-latest, ubuntu-latest, windows-latest]
 
     steps:

.pre-commit-config.yaml

@@ -0,0 +1,53 @@
+repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.31.0
+    hooks:
+      - id: pyupgrade
+        args: ["--py37-plus"]
+
+  - repo: https://github.com/psf/black
+    rev: 22.1.0
+    hooks:
+      - id: black
+        args: ["--target-version", "py37"]
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.0
+    hooks:
+      - id: python-check-blanket-noqa
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: check-merge-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: mixed-line-ending
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.5.1
+    hooks:
+      - id: prettier
+        args: [--prose-wrap=always, --print-width=88]
+
+  - repo: https://github.com/myint/autoflake
+    rev: v1.4
+    hooks:
+      - id: autoflake
+        args:
+          - --in-place
+          - --remove-all-unused-imports
+          - --expand-star-imports
+          - --remove-duplicate-keys
+          - --remove-unused-variables
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+      - id: flake8
+        additional_dependencies: [flake8-2020]

README.md

@@ -2,12 +2,11 @@
 
 import pytest
 
-
 here = os.path.dirname(__file__)
 version_file = os.path.join(here, "version.py")
 
 with open(version_file) as f:
-    code = compile(f.read(), version_file, 'exec')
+    code = compile(f.read(), version_file, "exec")
     exec(code)
 
 use_class_based_httpbin = pytest.mark.usefixtures("class_based_httpbin")

pytest_httpbin/__init__.py

@@ -15,7 +15,8 @@
 def where():
     """Return the preferred certificate bundle."""
     # vendored bundle inside Requests
-    return os.path.join(os.path.dirname(__file__), 'certs', 'cacert.pem')
+    return os.path.join(os.path.dirname(__file__), "certs", "cacert.pem")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     print(where())

pytest_httpbin/certs.py

@@ -1,41 +1,43 @@
-from __future__ import absolute_import
 import pytest
 from httpbin import app as httpbin_app
-from . import serve, certs
 
-@pytest.fixture(scope='session')
+from . import certs, serve
+
+
+@pytest.fixture(scope="session")
 def httpbin(request):
     server = serve.Server(application=httpbin_app)
     server.start()
     request.addfinalizer(server.stop)
     return server
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope="session")
 def httpbin_secure(request):
     server = serve.SecureServer(application=httpbin_app)
     server.start()
     request.addfinalizer(server.stop)
     return server
 
 
-@pytest.fixture(scope='session', params=['http', 'https'])
+@pytest.fixture(scope="session", params=["http", "https"])
 def httpbin_both(request, httpbin, httpbin_secure):
-    if request.param == 'http':
+    if request.param == "http":
         return httpbin
-    elif request.param == 'https':
+    elif request.param == "https":
         return httpbin_secure
 
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def class_based_httpbin(request, httpbin):
     request.cls.httpbin = httpbin
 
-@pytest.fixture(scope='class')
+
+@pytest.fixture(scope="class")
 def class_based_httpbin_secure(request, httpbin_secure):
     request.cls.httpbin_secure = httpbin_secure
 
 
-@pytest.fixture(scope='function')
+@pytest.fixture(scope="function")
 def httpbin_ca_bundle(monkeypatch):
-    monkeypatch.setenv('REQUESTS_CA_BUNDLE', certs.where())
+    monkeypatch.setenv("REQUESTS_CA_BUNDLE", certs.where())

pytest_httpbin/plugin.py

@@ -1,34 +1,33 @@
 import os
-import threading
 import ssl
-from wsgiref.simple_server import WSGIServer, make_server, WSGIRequestHandler
+import threading
 from wsgiref.handlers import SimpleHandler
-from six.moves.urllib.parse import urljoin
+from wsgiref.simple_server import WSGIRequestHandler, WSGIServer, make_server
 
+from six.moves.urllib.parse import urljoin
 
-CERT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'certs')
+CERT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "certs")
 
 
 class ServerHandler(SimpleHandler):
 
-    server_software = 'Pytest-HTTPBIN/0.1.0'
-    http_version = '1.1'
+    server_software = "Pytest-HTTPBIN/0.1.0"
+    http_version = "1.1"
 
     def cleanup_headers(self):
         SimpleHandler.cleanup_headers(self)
-        self.headers['Connection'] = 'Close'
+        self.headers["Connection"] = "Close"
 
     def close(self):
         try:
             self.request_handler.log_request(
-                self.status.split(' ', 1)[0], self.bytes_sent
+                self.status.split(" ", 1)[0], self.bytes_sent
             )
         finally:
             SimpleHandler.close(self)
 
 
 class Handler(WSGIRequestHandler):
-
     def handle(self):
         """Handle a single HTTP request"""
 
@@ -39,7 +38,7 @@ def handle(self):
         handler = ServerHandler(
             self.rfile, self.wfile, self.get_stderr(), self.get_environ()
         )
-        handler.request_handler = self      # backpointer for logging
+        handler.request_handler = self  # backpointer for logging
         handler.run(self.server.get_app())
 
     def get_environ(self):
@@ -49,13 +48,12 @@ def get_environ(self):
         """
         # Note: Can't use super since this is an oldstyle class in python 2.x
         environ = WSGIRequestHandler.get_environ(self).copy()
-        if self.headers.get('content-type') is None:
-            del environ['CONTENT_TYPE']
+        if self.headers.get("content-type") is None:
+            del environ["CONTENT_TYPE"]
         return environ
 
 
 class SecureWSGIServer(WSGIServer):
-
     def finish_request(self, request, client_address):
         """
         Negotiates SSL and then mimics BaseServer behavior.
@@ -64,12 +62,12 @@ def finish_request(self, request, client_address):
         try:
             ssock = ssl.wrap_socket(
                 request,
-                keyfile=os.path.join(CERT_DIR, 'key.pem'),
-                certfile=os.path.join(CERT_DIR, 'cert.pem'),
+                keyfile=os.path.join(CERT_DIR, "key.pem"),
+                certfile=os.path.join(CERT_DIR, "cert.pem"),
                 server_side=True,
                 suppress_ragged_eofs=False,
             )
-            self.base_environ['HTTPS'] = 'yes'
+            self.base_environ["HTTPS"] = "yes"
             self.RequestHandlerClass(ssock, client_address, self)
         except Exception as e:
             print("pytest-httpbin server hit an exception serving request: %s" % e)
@@ -78,35 +76,31 @@ def finish_request(self, request, client_address):
         # Thanks, WSGIRequestHandler!!
 
 
-class Server(object):
+class Server:
     """
     HTTP server running a WSGI application in its own thread.
     """
 
-    port_envvar = 'HTTPBIN_HTTP_PORT'
+    port_envvar = "HTTPBIN_HTTP_PORT"
 
-    def __init__(self, host='127.0.0.1', port=0, application=None, **kwargs):
+    def __init__(self, host="127.0.0.1", port=0, application=None, **kwargs):
         self.app = application
         if self.port_envvar in os.environ:
             port = int(os.environ[self.port_envvar])
         self._server = make_server(
-            host,
-            port,
-            self.app,
-            handler_class=Handler,
-            **kwargs
+            host, port, self.app, handler_class=Handler, **kwargs
         )
         self.host = self._server.server_address[0]
         self.port = self._server.server_address[1]
-        self.protocol = 'http'
+        self.protocol = "http"
 
         self._thread = threading.Thread(
             name=self.__class__,
             target=self._server.serve_forever,
         )
 
     def __del__(self):
-        if hasattr(self, '_server'):
+        if hasattr(self, "_server"):
             self.stop()
 
     def start(self):
@@ -120,16 +114,16 @@ def stop(self):
 
     @property
     def url(self):
-        return '{0}://{1}:{2}'.format(self.protocol, self.host, self.port)
+        return f"{self.protocol}://{self.host}:{self.port}"
 
     def join(self, url, allow_fragments=True):
         return urljoin(self.url, url, allow_fragments=allow_fragments)
 
 
 class SecureServer(Server):
-    port_envvar = 'HTTPBIN_HTTPS_PORT'
+    port_envvar = "HTTPBIN_HTTPS_PORT"
 
-    def __init__(self, host='127.0.0.1', port=0, application=None, **kwargs):
-        kwargs['server_class'] = SecureWSGIServer
-        super(SecureServer, self).__init__(host, port, application, **kwargs)
-        self.protocol = 'https'
+    def __init__(self, host="127.0.0.1", port=0, application=None, **kwargs):
+        kwargs["server_class"] = SecureWSGIServer
+        super().__init__(host, port, application, **kwargs)
+        self.protocol = "https"

pytest_httpbin/serve.py

@@ -1 +1 @@
-__version__ = '1.0.2'
+__version__ = "1.0.2"

pytest_httpbin/version.py

@@ -3,3 +3,9 @@
 # 3. If at all possible, it is good practice to do this. If you cannot, you
 # will need to generate wheels for each Python version that you support.
 universal=1
+
+[flake8]
+disable-noqa = True
+max-line-length = 88
+extend-ignore =
+   E203,  # whitespace before : is not PEP8 compliant (& conflicts with black)

setup.cfg

@@ -1,65 +1,58 @@
-from setuptools import setup, find_packages
 import codecs
 import os
-import re
 
+from setuptools import find_packages, setup
+
+__version__ = None
 with open("pytest_httpbin/version.py") as f:
-    code = compile(f.read(), "pytest_httpbin/version.py", 'exec')
+    code = compile(f.read(), "pytest_httpbin/version.py", "exec")
     exec(code)
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 # Get the long description from the relevant file
-with codecs.open(os.path.join(here, 'DESCRIPTION.rst'), encoding='utf-8') as f:
+with codecs.open(os.path.join(here, "DESCRIPTION.rst"), encoding="utf-8") as f:
     long_description = f.read()
 
 setup(
     name="pytest-httpbin",
-
     # There are various approaches to referencing the version. For a discussion,
     # see http://packaging.python.org/en/latest/tutorial.html#version
     version=__version__,
-
     description="Easily test your HTTP library against a local copy of httpbin",
     long_description=long_description,
     long_description_content_type="text/x-rst",
-
     # The project URL.
-    url='https://github.com/kevin1024/pytest-httpbin',
-
+    url="https://github.com/kevin1024/pytest-httpbin",
     # Author details
-    author='Kevin McCarthy',
-    author_email='me@kevinmccarthy.org',
-
+    author="Kevin McCarthy",
+    author_email="me@kevinmccarthy.org",
     # Choose your license
-    license='MIT',
-
+    license="MIT",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Testing',
-        'Topic :: Software Development :: Libraries',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Testing",
+        "Topic :: Software Development :: Libraries",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
-
     # What does your project relate to?
-    keywords='pytest-httpbin testing pytest httpbin',
+    keywords="pytest-httpbin testing pytest httpbin",
     packages=find_packages(exclude=["contrib", "docs", "tests*"]),
-    include_package_data = True, # include files listed in MANIFEST.in
-    install_requires = ['httpbin','six'],
-    extras_require = {"test": ["requests", "pytest"]},
-
+    include_package_data=True,  # include files listed in MANIFEST.in
+    install_requires=["httpbin", "six"],
+    extras_require={"test": ["requests", "pytest"]},
+    python_requires=">=3.7",
     # the following makes a plugin available to pytest
-    entry_points = {
-        'pytest11': [
-            'httpbin = pytest_httpbin.plugin',
+    entry_points={
+        "pytest11": [
+            "httpbin = pytest_httpbin.plugin",
         ]
     },
 )