cli: fix compat with newer versions of typer

click-help-colors is no longer compatible with typer and the colours
look fine as-is, so drop it.
fastapi/typer#47 (comment)

fixes #33

Author: classabbyamp

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 ## [Unreleased]
+### Fixed
+- Compatibility with newer typer versions (#33).
 
 
 ## [1.1.0] - 2023-01-29

callsignlookuptools/__main__.py

@@ -11,17 +11,20 @@
 
 from callsignlookuptools import __info__
 from callsignlookuptools.common.enums import DataSource
-from callsignlookuptools.cli import run_query, ColourTyper
+from callsignlookuptools.cli import run_query
 
 try:
     import typer
-    from typer import colors, echo, style
+    from typer import colors, echo, style, Typer
 except ModuleNotFoundError:
     print(f"To use the {__info__.__project__} CLI you must install 'typer[all]'", file=stderr)
     raise SystemExit(42)
 
 
-app = ColourTyper(add_completion=False)
+epilog = (f"Copyright {__info__.__copyright__} by {__info__.__author__}. "
+          f"Released under the {__info__.__license__} License")
+
+app = Typer(context_settings={"help_option_names": ["-h", "--help"]}, epilog=epilog, add_completion=False)
 
 
 def version_callback(value: bool):

callsignlookuptools/cli.py

@@ -22,12 +22,6 @@
     print(f"To use the {__info__.__project__} CLI you must install 'typer[all]'", file=stderr)
     raise SystemExit(42)
 
-try:
-    from click_help_colors import HelpColorsCommand, HelpColorsGroup  # type: ignore[import]
-except ModuleNotFoundError:
-    secho(f"To use the {__info__.__project__} CLI you must install 'click-help-colors'", fg=colors.RED, err=True)
-    raise typer.Exit(42)
-
 
 lookup_classes = {
     DataSource.QRZ: QrzSyncClient,
@@ -107,34 +101,3 @@ def run_query(source: DataSource, query: str, username: Optional[str] = None, pa
     else:
         secho("No callsign given", fg=colors.RED, err=True)
         raise typer.Exit(1)
-
-
-# The following is for adding colours to command help output
-# See https://github.com/tiangolo/typer/issues/47
-
-class CustomHelpColoursGroup(HelpColorsGroup):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-        self.help_headers_color = "blue"
-        self.help_options_color = "yellow"
-
-
-class CustomHelpColoursCommand(HelpColorsCommand):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-        self.help_headers_color = "blue"
-        self.help_options_color = "yellow"
-
-
-epilog = (f"Copyright {__info__.__copyright__} by {__info__.__author__}. "
-          f"Released under the {__info__.__license__} License")
-
-
-class ColourTyper(typer.Typer):
-    def __init__(self, *args, cls=CustomHelpColoursGroup, context_settings={"help_option_names": ["-h", "--help"]},
-                 **kwargs) -> None:
-        super().__init__(*args, cls=cls, context_settings=context_settings, epilog=epilog, **kwargs)
-
-    def command(self, *args, cls=CustomHelpColoursCommand, context_settings={"help_option_names": ["-h", "--help"]},
-                **kwargs) -> Callable:
-        return super().command(*args, cls=cls, context_settings=context_settings, epilog=epilog, **kwargs)

setup.py

@@ -42,7 +42,7 @@
         "requests; extra != 'async'"
     ],
     extras_require={
-        "cli": ["typer[all]", "click-help-colors"],
+        "cli": ["typer[all]"],
         "async": ["aiohttp"],
         "all": ["aiohttp"]
     },