From 04375ab5713d9510bf429a82def4fd785bea24f7 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Thu, 24 Sep 2020 11:46:39 +0200
Subject: [PATCH] Adapt cli declaration entrypoint to swh.core 0.3
---
requirements-swh.txt | 1 +
setup.py | 2 +-
swh/web/client/cli.py | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/requirements-swh.txt b/requirements-swh.txt
index 51a0067..7d8c1a3 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,2 +1,3 @@
# Add here internal Software Heritage dependencies, one per line.
+swh.core >= 0.3
swh.model
diff --git a/setup.py b/setup.py
index da2505d..5c08132 100755
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,6 @@ setup(
},
entry_points="""
[swh.cli.subcommands]
- auth=swh.web.client.cli:auth
+ auth=swh.web.client.cli
""",
)
diff --git a/swh/web/client/cli.py b/swh/web/client/cli.py
index aca7e23..22666dd 100644
--- a/swh/web/client/cli.py
+++ b/swh/web/client/cli.py
@@ -7,11 +7,12 @@
# control
import click
from click.core import Context
+from swh.core.cli import swh as swh_cli_group
CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
-@click.group(name="auth", context_settings=CONTEXT_SETTINGS)
+@swh_cli_group.group(name="auth", context_settings=CONTEXT_SETTINGS)
@click.option(
"--oidc-server-url",
"oidc_server_url",
--
GitLab