Skip to content

fix #27: Use importlib.metadata.version instead of __version__ #28

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix #27: Use importlib.metadata.version instead of __version__ #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions click_aliases/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
"""
Extension for the python ``click`` module
to provide a group or command with aliases.
Extension for the python ``click`` module
to provide a group or command with aliases.
"""

import typing as t
from importlib import metadata

import click

_click7 = click.__version__[0] >= "7"
_click7: bool = metadata.version("click")[0] >= "7"


class ClickAliasedGroup(click.Group):
def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
super().__init__(*args, **kwargs)
self._commands: t.Dict[str, list[str]] = {}
self._aliases: t.Dict[str, str] = {}
self._commands: dict[str, list[str]] = {}
self._aliases: dict[str, str] = {}

def add_command(self, *args: t.Any, **kwargs: t.Any) -> None:
aliases = kwargs.pop("aliases", [])
Expand All @@ -32,7 +33,7 @@ def add_command(self, *args: t.Any, **kwargs: t.Any) -> None:

def command( # type: ignore[override]
self, *args: t.Any, **kwargs: t.Any
) -> t.Union[t.Callable[[t.Callable[..., t.Any]], click.Command], click.Command]:
) -> t.Callable[[t.Callable[..., t.Any]], click.Command] | click.Command:
aliases = kwargs.pop("aliases", [])
decorator = super().command(*args, **kwargs)
if not aliases:
Expand All @@ -50,7 +51,7 @@ def _decorator(f):

def group( # type: ignore[override]
self, *args: t.Any, **kwargs: t.Any
) -> t.Union[t.Callable[[t.Callable[..., t.Any]], click.Group], click.Group]:
) -> t.Callable[[t.Callable[..., t.Any]], click.Group] | click.Group:
aliases = kwargs.pop("aliases", [])
decorator = super().group(*args, **kwargs)
if not aliases:
Expand All @@ -71,7 +72,7 @@ def resolve_alias(self, cmd_name: str) -> str:
return self._aliases[cmd_name]
return cmd_name

def get_command(self, ctx: click.Context, cmd_name: str) -> t.Optional[click.Command]:
def get_command(self, ctx: click.Context, cmd_name: str) -> click.Command | None:
cmd_name = self.resolve_alias(cmd_name)
command = super().get_command(ctx, cmd_name)
if command:
Expand Down