Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass package_name explicitly in click.version_option decorators for compatibility with click>=8.0 #1400

Merged
merged 10 commits into from
Jun 4, 2021
Merged

Pass package_name explicitly in click.version_option decorators for compatibility with click>=8.0 #1400

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6b81eeb
pass package_name explicitly in click.version_option decorators
nicoa May 19, 2021
0b07690
bump dependency to version click >= 8
nicoa May 26, 2021
d46cf97
reenable click7 and provide package options depending on a switch on …
nicoa May 27, 2021
1d70557
remove unnecessary split string in click version comparison
nicoa May 27, 2021
fbef894
added compat module for click version and use that to determine the v…
nicoa May 27, 2021
726f819
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 27, 2021
462fb9c
name variable corresponding to click major version properly
nicoa May 27, 2021
bc2034f
get rid of dependency on pip vendored packages
nicoa May 27, 2021
77af4d2
Merge branch 'master' into master
nicoa Jun 1, 2021
3478be3
Merge branch 'master' into master
webknjaz Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion piptools/scripts/compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
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
if click.__version__[0] == "7":
nicoa marked this conversation as resolved.
Show resolved Hide resolved
ver_kwargs = {}
else:
# this was introduced in click8 and if not passed would break this package
ver_kwargs = {"package_name": "pip-tools"}


def _get_default_option(option_name: str) -> Any:
"""
Expand All @@ -45,7 +52,7 @@ def _get_default_option(option_name: str) -> Any:


@click.command(context_settings={"help_option_names": ("-h", "--help")})
@click.version_option()
@click.version_option(**ver_kwargs)
@click.pass_context
@click.option("-v", "--verbose", count=True, help="Show more output")
@click.option("-q", "--quiet", count=True, help="Give less output")
Expand Down
10 changes: 9 additions & 1 deletion piptools/scripts/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,16 @@
DEFAULT_REQUIREMENTS_FILE = "requirements.txt"


# TODO: drop click 7 and remove this block, pass directly to version_option
if click.__version__[0] == "7":
ver_kwargs = {}
else:
# this was introduced in click8 and if not passed would break this package
ver_kwargs = {"package_name": "pip-tools"}


@click.command(context_settings={"help_option_names": ("-h", "--help")})
@click.version_option()
@click.version_option(**ver_kwargs)
@click.option(
"-a",
"--ask",
Expand Down