From 09e6f5d8f9dde0e13cb5ebbeb21c44c8629daf2e Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Sat, 19 Nov 2022 15:18:02 +0100
Subject: [PATCH] Bump click minimum version to `>= 8` (#1733)

---
 piptools/_compat/__init__.py | 3 +--
 piptools/_compat/click.py    | 9 ---------
 piptools/scripts/compile.py  | 7 ++-----
 piptools/scripts/sync.py     | 7 ++-----
 setup.cfg                    | 2 +-
 5 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 piptools/_compat/click.py

diff --git a/piptools/_compat/__init__.py b/piptools/_compat/__init__.py
index 293286599..943143253 100644
--- 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
deleted file mode 100644
index afb700d9d..000000000
--- a/piptools/_compat/click.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-import click
-
-CLICK_MAJOR_VERSION = int(
-    # extract major version of click
-    click.__version__.split(".")[0]
-)
-IS_CLICK_VER_8_PLUS = CLICK_MAJOR_VERSION > 7
diff --git a/piptools/scripts/compile.py b/piptools/scripts/compile.py
index 618380b58..8438e7f55 100755
--- 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
index bad197a6a..8b60adad5 100755
--- 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
index 589680536..f0878f96b 100644
--- 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