From 05eb74493cbeaa5cbf5fcf11ea7b16bc223bb48a Mon Sep 17 00:00:00 2001 From: Thomas Ilsche Date: Thu, 1 Jun 2023 12:16:16 +0200 Subject: [PATCH] feat: remove click-completion Shell completion is now supported by click itself and the extra package is dead. https://github.com/click-contrib/click-completion/issues/37 https://github.com/click-contrib/click-completion/issues/41 It is still not trivial to use because it needs to be enabled for the shell. And maybe is and always was impossible for these example .py files because they are not real commands anyway. https://click.palletsprojects.com/en/8.1.x/shell-completion/ --- examples/metricq_client.py | 2 -- examples/metricq_get_history.py | 3 --- examples/metricq_get_history_raw.py | 3 --- examples/metricq_pandas.py | 3 --- examples/metricq_sink.py | 3 --- examples/metricq_source.py | 3 --- examples/metricq_synchronous_source.py | 3 --- setup.cfg | 1 - 8 files changed, 21 deletions(-) diff --git a/examples/metricq_client.py b/examples/metricq_client.py index 53c51d6f..130c3f06 100755 --- a/examples/metricq_client.py +++ b/examples/metricq_client.py @@ -44,7 +44,6 @@ import aiomonitor # type: ignore import click -import click_completion # type: ignore import click_log # type: ignore import metricq @@ -55,7 +54,6 @@ logger.handlers[0].formatter = logging.Formatter( fmt="%(asctime)s [%(levelname)-8s] [%(name)-20s] %(message)s" ) -click_completion.init() async def run(server: str, token: str) -> None: diff --git a/examples/metricq_get_history.py b/examples/metricq_get_history.py index 4cfc71a7..b7f3c65e 100755 --- a/examples/metricq_get_history.py +++ b/examples/metricq_get_history.py @@ -33,7 +33,6 @@ from datetime import timedelta import click -import click_completion # type: ignore import click_log # type: ignore import metricq @@ -48,8 +47,6 @@ fmt="%(asctime)s [%(levelname)-8s] [%(name)-20s] %(message)s" ) -click_completion.init() - async def aget_history( server: str, token: str, metric: str, list_metrics: bool, list_metadata: bool diff --git a/examples/metricq_get_history_raw.py b/examples/metricq_get_history_raw.py index 37ab44cd..3fe2a282 100755 --- a/examples/metricq_get_history_raw.py +++ b/examples/metricq_get_history_raw.py @@ -32,7 +32,6 @@ from datetime import timedelta import click -import click_completion # type: ignore import click_log # type: ignore import metricq @@ -48,8 +47,6 @@ fmt="%(asctime)s [%(levelname)-8s] [%(name)-20s] %(message)s" ) -click_completion.init() - async def aget_history(server: str, token: str, metric: str) -> None: client = metricq.HistoryClient(token=token, url=server) diff --git a/examples/metricq_pandas.py b/examples/metricq_pandas.py index 8289528a..1096f079 100755 --- a/examples/metricq_pandas.py +++ b/examples/metricq_pandas.py @@ -32,7 +32,6 @@ from datetime import timedelta import click -import click_completion # type: ignore import click_log # type: ignore import metricq @@ -48,8 +47,6 @@ fmt="%(asctime)s [%(levelname)-8s] [%(name)-20s] %(message)s" ) -click_completion.init() - async def aget_history(server: str, token: str, metric: str) -> None: async with PandasHistoryClient(token=token, url=server) as client: diff --git a/examples/metricq_sink.py b/examples/metricq_sink.py index 36f22ebf..272487d6 100755 --- a/examples/metricq_sink.py +++ b/examples/metricq_sink.py @@ -31,7 +31,6 @@ from typing import Any import click -import click_completion # type: ignore import click_log # type: ignore import metricq @@ -46,8 +45,6 @@ fmt="%(asctime)s [%(levelname)-8s] [%(name)-20s] %(message)s" ) -click_completion.init() - # To implement a MetricQ Sink, subclass metricq.Sink class DummySink(metricq.Sink): diff --git a/examples/metricq_source.py b/examples/metricq_source.py index a746df82..7004834c 100755 --- a/examples/metricq_source.py +++ b/examples/metricq_source.py @@ -32,7 +32,6 @@ from typing import Any import click -import click_completion # type: ignore import click_log # type: ignore import metricq @@ -46,8 +45,6 @@ fmt="%(asctime)s [%(levelname)-8s] [%(name)-20s] %(message)s" ) -click_completion.init() - class DummySource(metricq.IntervalSource): def __init__(self, *args: Any, **kwargs: Any): diff --git a/examples/metricq_synchronous_source.py b/examples/metricq_synchronous_source.py index 22b37d56..6050915d 100755 --- a/examples/metricq_synchronous_source.py +++ b/examples/metricq_synchronous_source.py @@ -34,7 +34,6 @@ import time import click -import click_completion # type: ignore import click_log # type: ignore from metricq import SynchronousSource, Timestamp, get_logger @@ -47,8 +46,6 @@ fmt="%(asctime)s [%(levelname)-8s] [%(name)-20s] %(message)s" ) -click_completion.init() - @click.command() @click.option("--server", default="amqp://localhost/") diff --git a/setup.cfg b/setup.cfg index 02ff72bb..1f4ffbe4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,6 @@ examples = aiomonitor-ng click click-log - click-completion lint = black[jupyter] ~= 23.1.0 flake8