Add support for click 8

.circleci/config.yml

@@ -88,6 +88,18 @@ jobs:
       - image: circleci/python:3.7
         environment:
           - TOXENV=py37-click6-coverage
+  py38-click7:
+    <<: *common
+    docker:
+      - image: circleci/python:3.8
+        environment:
+          - TOXENV=py38-click7-coverage
+  py38-click70:
+    <<: *common
+    docker:
+      - image: circleci/python:3.8
+        environment:
+          - TOXENV=py38-click70-coverage
   checkqa:
     <<: *common
     docker:
@@ -99,6 +111,8 @@ workflows:
   test:
     jobs:
       - py38
+      - py38-click7
+      - py38-click70
       - py37-coveragepy5
       - py37
       - py37-click6

covimerage/__init__.py

@@ -5,8 +5,8 @@
 import re
 
 import attr
-from click.utils import string_types
 
+from ._compat import string_types
 from .coveragepy import CoverageData
 from .logger import logger
 from .utils import (

covimerage/_compat.py

@@ -1,3 +1,5 @@
+import sys
+
 try:
     FileNotFoundError = FileNotFoundError
 except NameError:
@@ -12,3 +14,8 @@
     from shlex import quote as shell_quote
 except ImportError:
     from pipes import quote as shell_quote  # noqa: F401
+
+if sys.version_info < (3,):
+    string_types = (str, unicode)  # noqa: F821
+else:
+    string_types = str

covimerage/utils.py

@@ -1,9 +1,7 @@
 import os
 import re
 
-from click.utils import string_types
-
-from ._compat import shell_quote
+from ._compat import shell_quote, string_types
 
 # Empty (whitespace only), comments, continued, or `end` statements.
 RE_NON_EXECED = re.compile(r'^\s*("|end|$)')

setup.py

@@ -81,7 +81,7 @@ def run(self):
     ],
     install_requires=[
         'attrs>=16.1.0',
-        'click<7.1',
+        'click',
         'coverage<5.0a6',
     ],
     extras_require={

tests/test_cli.py

@@ -13,6 +13,15 @@
 from covimerage.cli import get_version_message
 
 
+def format_click_arg(name):
+    if click.__version__ < '7.0':
+        return '"{}"'.format(name)
+    elif click.__version__ < '7.1':
+        return '"{}..."'.format(name.upper())
+    else:
+        return "'{}...'".format(name.upper())
+
+
 def test_dunder_main_run(capfd):
     assert call([sys.executable, '-m', 'covimerage']) == 0
     out, err = capfd.readouterr()
@@ -795,9 +804,10 @@ def test_run_forwards_sighup(devnull):
 
 def test_run_cmd_requires_args(runner):
     result = runner.invoke(cli.run, [])
-    assert 'Error: Missing argument "%s".' % (
-        'args' if click.__version__ < '7.0' else 'ARGS...',
-    ) in result.output.splitlines()
+    assert (
+        'Error: Missing argument {}.'.format(format_click_arg('args'))
+        in result.output.splitlines()
+    )
     assert result.exit_code == 2
 
 

tests/test_logging.py

@@ -37,12 +37,13 @@ def assert_output(result):
         if click.__version__ < '7.0':
             assert result.output.splitlines() == [
                 'Error: no such option: --nonexistingoption']
+            return
+        lines = result.output.splitlines()
+        assert lines[0] == 'Usage: main report [OPTIONS] [PROFILE_FILE]...'
+        if click.__version__ < '8.0':
+            assert lines[-1] == 'Error: no such option: --nonexistingoption'
         else:
-            assert result.output.splitlines() == [
-                'Usage: main report [OPTIONS] [PROFILE_FILE]...',
-                'Try "main report -h" for help.',
-                '',
-                'Error: no such option: --nonexistingoption']
+            assert lines[-1] == 'Error: No such option: --nonexistingoption'
 
     for level in ['error', 'warning', 'info', 'debug']:
         result = runner.invoke(cli.main, [

tox.ini

@@ -12,6 +12,8 @@ changedir =
   integration: {envtmpdir}
 deps =
   click6: click<7
+  click7: click<8
+  click70: click<7.1
   coverage: pytest-cov
   coveragepy4: coverage<5
   coveragepy5: coverage==5.0a5