Move cli alongside other Typer modules

data_safe_haven/commands/__init__.py

@@ -1,13 +1,3 @@
-from .admin import admin_command_group
-from .config import config_command_group
-from .context import context_command_group
-from .deploy import deploy_command_group
-from .teardown import teardown_command_group
+from .cli import application
 
-__all__ = [
-    "admin_command_group",
-    "context_command_group",
-    "config_command_group",
-    "deploy_command_group",
-    "teardown_command_group",
-]
+__all__ = ["application"]

data_safe_haven/cli.py → data_safe_haven/commands/cli.py

@@ -6,16 +6,14 @@
 import typer
 
 from data_safe_haven import __version__
-from data_safe_haven.commands import (
-    admin_command_group,
-    config_command_group,
-    context_command_group,
-    deploy_command_group,
-    teardown_command_group,
-)
 from data_safe_haven.exceptions import DataSafeHavenError
 from data_safe_haven.utility import LoggingSingleton
 
+from .admin import admin_command_group
+from .config import config_command_group
+from .context import context_command_group
+from .deploy import deploy_command_group
+from .teardown import teardown_command_group
 
 # Create the application
 application = typer.Typer(

pyproject.toml

@@ -50,7 +50,7 @@ dependencies = [
 ]
 
 [project.scripts]
-dsh = "data_safe_haven.cli:main"
+dsh = "data_safe_haven.commands.cli:main"
 
 [tool.hatch.version]
 path = "data_safe_haven/version.py"

tests/commands/test_help.py → tests/commands/test_cli.py

@@ -1,4 +1,4 @@
-from data_safe_haven.cli import application
+from data_safe_haven.commands import application
 
 
 class TestHelp:

tests/commands/test_config.py

@@ -1,4 +1,4 @@
-from data_safe_haven.commands import config_command_group
+from data_safe_haven.commands.config import config_command_group
 from data_safe_haven.config import Config
 from data_safe_haven.external import AzureApi
 

tests/commands/test_context.py

@@ -1,4 +1,4 @@
-from data_safe_haven.commands import context_command_group
+from data_safe_haven.commands.context import context_command_group
 from data_safe_haven.context_infrastructure import ContextInfrastructure