Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions dtcli/cli.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"""Datatrail Command Line Interface."""

from importlib.metadata import version as package_version

import click
from click_aliasing import ClickAliasedGroup
from pkg_resources import get_distribution
from rich import console, pretty

from dtcli import clear, config, ls, ps, pull, scout
Expand All @@ -16,7 +17,10 @@
@click.group(cls=ClickAliasedGroup)
def cli():
"""Datatrail Command Line Interface."""
check_version()
try:
check_version()
except Exception:
pass


@cli.command(name="version", help="Show versions.")
Expand All @@ -27,7 +31,7 @@ def version():
style="bold",
)
terminal.print(
f"{get_distribution('datatrail-cli')}",
f"datatrail-cli {package_version('datatrail-cli')}",
style="green",
)
terminal.print(
Expand All @@ -47,7 +51,7 @@ def version():
def check_version() -> None:
"""Check if CLI is latest release."""
if not utilities.cli_is_latest_release():
current_version = get_distribution("datatrail-cli").version
current_version = package_version("datatrail-cli")
latest_version = utilities.get_latest_released_version()
terminal.print(
f"A new release of datatrail-cli is available: {current_version} → {latest_version}", # noqa: E501
Expand Down
6 changes: 3 additions & 3 deletions dtcli/utilities/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ def get_latest_released_version(

def cli_is_latest_release() -> bool:
"""Check if CLI is latest release."""
from pkg_resources import get_distribution
from importlib.metadata import PackageNotFoundError, version

try:
current_version = parse(get_distribution("datatrail-cli").version)
current_version = parse(version("datatrail-cli"))
return current_version == get_latest_released_version()
except ConnectionError:
except (ConnectionError, PackageNotFoundError):
return True