Drop Python 2.7 and 3.4 (#114)

* Update CHANGELOG for 1.0.0
* Introduce pre-commit and linting

Author: nicoddemus

.github/workflows/main.yml

@@ -11,17 +11,15 @@ jobs:
       fail-fast: false
       matrix:
         tox_env: [
-          "py27",
           "py35",
           "py36",
           "py37",
           "py38",
           "pre",
+          "linting",
         ]
 
         include:
-          - tox_env: "py27"
-            python: "2.7"
           - tox_env: "py35"
             python: "3.5"
           - tox_env: "py36"
@@ -32,7 +30,9 @@ jobs:
             python: "3.8"
           - tox_env: "pre"
             python: "3.7"
-        
+          - tox_env: "linting"
+            python: "3.7"
+
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python
@@ -46,7 +46,7 @@ jobs:
     - name: Test
       run: |
         tox -e ${{ matrix.tox_env }}
-  
+
   deploy:
 
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.2.3
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: fix-encoding-pragma
+        args: [--remove]
+    -   id: check-yaml
+-   repo: https://github.com/asottile/reorder_python_imports
+    rev: v1.4.0
+    hooks:
+    -   id: reorder-python-imports
+        args: ['--application-directories=.:src', --py3-plus]
+-   repo: local
+    hooks:
+    -   id: rst
+        name: rst
+        entry: rst-lint --encoding utf-8
+        files: ^(HOWTORELEASE.rst|README.rst)$
+        language: python
+        additional_dependencies: [pygments, restructuredtext_lint]

docs/changelog.rst

@@ -3,6 +3,11 @@
 Changelog
 =========
 
+1.0.0 (UNRELEASED)
+------------------
+
+- Python 2.7 is no longer supported.
+
 0.15.1 (2020-02-03)
 -------------------
 

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # pytest-flask documentation build configuration file, created by
 # sphinx-quickstart on Thu Feb 19 17:57:27 2015.
@@ -11,8 +10,9 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
-import sys, os, datetime
+import datetime
+import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

pytest_flask/__init__.py

@@ -1,4 +1,2 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from ._version import version as __version__

pytest_flask/fixtures.py

@@ -1,19 +1,14 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-import time
+import logging
 import multiprocessing
-import pytest
-import socket
-import signal
 import os
-import logging
-
-try:
-    from urllib2 import URLError, urlopen
-except ImportError:
-    from urllib.error import URLError
-    from urllib.request import urlopen
+import signal
+import socket
+import time
+from urllib.error import URLError
+from urllib.request import urlopen
 
+import pytest
 from flask import _request_ctx_stack
 
 
@@ -45,7 +40,7 @@ def test_login(self):
         request.cls.client = client
 
 
-class LiveServer(object):
+class LiveServer:
     """The helper class uses to manage live server. Handles creation and
     stopping application in a separate process.
 

pytest_flask/plugin.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
     A py.test plugin which helps testing Flask applications.
 
@@ -9,18 +8,22 @@
 import sys
 
 import pytest
-
 from flask import json
 from werkzeug.utils import cached_property
 
-from .fixtures import (
-    client, config, accept_json, accept_jsonp, accept_any, accept_mimetype,
-    client_class, live_server, request_ctx
-)
+from .fixtures import accept_any
+from .fixtures import accept_json
+from .fixtures import accept_jsonp
+from .fixtures import accept_mimetype
+from .fixtures import client
+from .fixtures import client_class
+from .fixtures import config
+from .fixtures import live_server
+from .fixtures import request_ctx
 from .pytest_compat import getfixturevalue
 
 
-class JSONResponse(object):
+class JSONResponse:
     """Mixin with testing helper methods for JSON responses."""
 
     @cached_property
@@ -38,13 +41,13 @@ def __eq__(self, other):
         # separate so we can simplify the code once Python 2 support is dropped
         if sys.version_info[0] == 2:
             try:
-                super_eq = super(JSONResponse, self).__eq__
+                super_eq = super().__eq__
             except AttributeError:
                 return NotImplemented
             else:
                 return super_eq(other)
         else:
-            return super(JSONResponse, self).__eq__(other)
+            return super().__eq__(other)
 
     def __ne__(self, other):
         return not self == other

setup.cfg

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 pytest-flask
 ============
@@ -102,18 +101,17 @@ def app():
 **suggestion**.
 
 """
-import io
 import os
-import re
-from setuptools import setup
+
 from setuptools import find_packages
+from setuptools import setup
 
 
 def read(*parts):
     """Reads the content of the file located at path created from *parts*."""
     try:
-        return io.open(os.path.join(*parts), 'r', encoding='utf-8').read()
-    except IOError:
+        return open(os.path.join(*parts), 'r', encoding='utf-8').read()
+    except OSError:
         return ''
 
 

setup.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-import pytest
-
 from textwrap import dedent
-from flask import Flask, jsonify
+
+import pytest
+from flask import Flask
+from flask import jsonify
 
 
 pytest_plugins = 'pytester'