Drop support for Python 2.7, 3.5, 3.6

Author: bittner

cli_test_helpers/commands.py

@@ -3,15 +3,9 @@
 """
 
 from sys import version_info
+from types import SimpleNamespace as Namespace
 
-try:
-    from types import SimpleNamespace as Namespace
-except ImportError:  # Python < 3.3
-    from argparse import Namespace
-
-if version_info < (3, 5):  # Python 2.7
-    from subprocess import PIPE, CalledProcessError, check_output
-elif version_info < (3, 7):
+if version_info < (3, 7):
     from subprocess import PIPE, run
 else:
     from subprocess import run
@@ -26,15 +20,7 @@ def shell(command, **kwargs):
     This is a better version of ``os.system()`` that captures output and
     returns a convenient namespace object.
     """
-    if version_info < (3, 5):  # Python 2.7
-        completed = Namespace(returncode=None, stdout=b"", stderr=b"")
-        try:
-            completed.stdout = check_output(command, shell=True, stderr=PIPE, **kwargs)
-            completed.returncode = 0
-        except CalledProcessError as ex:
-            completed.stdout = ex.output
-            completed.returncode = ex.returncode
-    elif version_info < (3, 7):
+    if version_info < (3, 7):
         completed = run(
             command, shell=True, stdout=PIPE, stderr=PIPE, check=False, **kwargs
         )

cli_test_helpers/decorators.py

@@ -2,12 +2,9 @@
 Useful helpers for writing tests for your CLI tool.
 """
 
+import contextlib
 import sys
-
-try:
-    from unittest.mock import patch
-except ImportError:  # Python 2.7
-    from mock import patch
+from unittest.mock import patch
 
 __all__ = []
 
@@ -45,13 +42,11 @@ def __init__(self, **kwargs):
         for key in self.clear_variables:
             kwargs.pop(key)
 
-        super(EnvironContext, self).__init__("os.environ", **kwargs)
+        super().__init__("os.environ", **kwargs)
 
     def __enter__(self):
-        super(EnvironContext, self).__enter__()
+        super().__enter__()
 
         for key in self.clear_variables:
-            try:
+            with contextlib.suppress(KeyError):
                 self.in_dict.pop(key)
-            except KeyError:
-                pass

pyproject.toml

@@ -65,11 +65,7 @@ extend-ignore = [
     "D205",
     "D212",
     "Q000",
-    "PERF203",  # Python < 3.4 (`contextlib.suppress`)
-    "SIM105",  # Python 2.7 only
-    "UP008",  # Python 2.7 only (`super()` call)
-    "UP022",  # Python 2.7 only (`stderr=PIPE`)
-    "UP026",  # Python 2.7 only (`mock` module)
+    "UP022",  # Python < 3.7 only (`stderr=PIPE`)
     "UP036",  # Python < 3.7 only
 ]