Bump click minimum version to >= 8 (#1733)

jazzband · Nov 19, 2022 · 09e6f5d · 09e6f5d
1 parent 6870602
commit 09e6f5d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/piptools/_compat/__init__.py b/piptools/_compat/__init__.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from .click import IS_CLICK_VER_8_PLUS
 from .pip_compat import PIP_VERSION, parse_requirements
 
-__all__ = ["PIP_VERSION", "IS_CLICK_VER_8_PLUS", "parse_requirements"]
+__all__ = ["PIP_VERSION", "parse_requirements"]
diff --git a/piptools/_compat/click.py b/piptools/_compat/click.py
diff --git a/piptools/scripts/compile.py b/piptools/scripts/compile.py
@@ -16,7 +16,7 @@
 from pip._internal.req.constructors import install_req_from_line
 from pip._internal.utils.misc import redact_auth_from_url
 
-from .._compat import IS_CLICK_VER_8_PLUS, parse_requirements
+from .._compat import parse_requirements
 from ..cache import DependencyCache
 from ..exceptions import NoCandidateFound, PipToolsError
 from ..locations import CACHE_DIR
@@ -37,9 +37,6 @@
 DEFAULT_REQUIREMENTS_OUTPUT_FILE = "requirements.txt"
 METADATA_FILENAMES = frozenset({"setup.py", "setup.cfg", "pyproject.toml"})
 
-# TODO: drop click 7 and remove this block, pass directly to version_option
-version_option_kwargs = {"package_name": "pip-tools"} if IS_CLICK_VER_8_PLUS else {}
-
 
 def _get_default_option(option_name: str) -> Any:
     """
@@ -81,7 +78,7 @@ def _determine_linesep(
 
 
 @click.command(context_settings={"help_option_names": ("-h", "--help")})
-@click.version_option(**version_option_kwargs)
+@click.version_option(package_name="pip-tools")
 @click.pass_context
 @click.option("-v", "--verbose", count=True, help="Show more output")
 @click.option("-q", "--quiet", count=True, help="Give less output")

diff --git a/piptools/scripts/sync.py b/piptools/scripts/sync.py
@@ -14,7 +14,7 @@
 from pip._internal.metadata import get_environment
 
 from .. import sync
-from .._compat import IS_CLICK_VER_8_PLUS, parse_requirements
+from .._compat import parse_requirements
 from .._compat.pip_compat import Distribution
 from ..exceptions import PipToolsError
 from ..logging import log
@@ -28,12 +28,9 @@
 
 DEFAULT_REQUIREMENTS_FILE = "requirements.txt"
 
-# TODO: drop click 7 and remove this block, pass directly to version_option
-version_option_kwargs = {"package_name": "pip-tools"} if IS_CLICK_VER_8_PLUS else {}
-
 
 @click.command(context_settings={"help_option_names": ("-h", "--help")})
-@click.version_option(**version_option_kwargs)
+@click.version_option(package_name="pip-tools")
 @click.option(
     "-a",
     "--ask",

diff --git a/setup.cfg b/setup.cfg
@@ -33,7 +33,7 @@ zip_safe = false
 install_requires =
     # direct dependencies
     build
-    click >= 7
+    click >= 8
     pip >= 22.2
     # indirect dependencies
     setuptools  # typically needed when pip-tools invokes setup.py