From 88e378a12a8a5dd11ef6229042985adc3f42a452 Mon Sep 17 00:00:00 2001 From: volaya Date: Wed, 9 Jun 2021 08:54:08 +0200 Subject: [PATCH 1/2] added version command fixes #123 --- stactools_cli/stactools/cli/__init__.py | 3 ++- .../stactools/cli/commands/version.py | 16 ++++++++++++++++ tests/cli/commands/test_version.py | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 stactools_cli/stactools/cli/commands/version.py create mode 100644 tests/cli/commands/test_version.py diff --git a/stactools_cli/stactools/cli/__init__.py b/stactools_cli/stactools/cli/__init__.py index 914c893d..2a6c1e5e 100644 --- a/stactools_cli/stactools/cli/__init__.py +++ b/stactools_cli/stactools/cli/__init__.py @@ -8,7 +8,7 @@ def register_plugin(registry): # Register subcommands - from stactools.cli.commands import (copy, info, layout, merge, migrate) + from stactools.cli.commands import (copy, info, layout, merge, migrate, version) registry.register_subcommand(copy.create_copy_command) registry.register_subcommand(copy.create_move_assets_command) @@ -16,6 +16,7 @@ def register_plugin(registry): registry.register_subcommand(info.create_describe_command) registry.register_subcommand(layout.create_layout_command) registry.register_subcommand(merge.create_merge_command) + registry.register_subcommand(version.create_version_command) # TODO # registry.register_subcommand(migrate.create_migrate_command) diff --git a/stactools_cli/stactools/cli/commands/version.py b/stactools_cli/stactools/cli/commands/version.py new file mode 100644 index 00000000..e909386a --- /dev/null +++ b/stactools_cli/stactools/cli/commands/version.py @@ -0,0 +1,16 @@ +from click import echo +from pystac.version import get_stac_version +from stactools.core.version import __version__ + + +def create_version_command(cli): + @cli.command( + 'version', + short_help='Display version info.') + def version_command(): + """Display version info + """ + echo(f"stactools version {__version__}") + echo(f"PySTAC version {get_stac_version()}") + + return version_command diff --git a/tests/cli/commands/test_version.py b/tests/cli/commands/test_version.py new file mode 100644 index 00000000..50cbbe85 --- /dev/null +++ b/tests/cli/commands/test_version.py @@ -0,0 +1,18 @@ +from pystac.version import get_stac_version +from stactools.core.version import __version__ +from stactools.cli.commands.version import create_version_command + +from tests.utils import (CliTestCase) + + +class VersionTest(CliTestCase): + + def create_subcommand_functions(self): + return [create_version_command] + + def test_hello_world(self): + result = self.run_command(['version']) + self.assertEqual(0, result.exit_code) + expected = (f"stactools version {__version__}\n" + f"PySTAC version {get_stac_version()}\n") + self.assertEqual(expected, result.output) From e967fc3152cbe6c8aaba74e2e52b8d2fb6a0bf1a Mon Sep 17 00:00:00 2001 From: volaya Date: Wed, 9 Jun 2021 09:12:40 +0200 Subject: [PATCH 2/2] format fixes --- stactools_cli/stactools/cli/__init__.py | 3 ++- stactools_cli/stactools/cli/commands/version.py | 4 +--- tests/cli/commands/test_version.py | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/stactools_cli/stactools/cli/__init__.py b/stactools_cli/stactools/cli/__init__.py index 2a6c1e5e..58dd2774 100644 --- a/stactools_cli/stactools/cli/__init__.py +++ b/stactools_cli/stactools/cli/__init__.py @@ -8,7 +8,8 @@ def register_plugin(registry): # Register subcommands - from stactools.cli.commands import (copy, info, layout, merge, migrate, version) + from stactools.cli.commands import (copy, info, layout, merge, migrate, + version) registry.register_subcommand(copy.create_copy_command) registry.register_subcommand(copy.create_move_assets_command) diff --git a/stactools_cli/stactools/cli/commands/version.py b/stactools_cli/stactools/cli/commands/version.py index e909386a..069f872e 100644 --- a/stactools_cli/stactools/cli/commands/version.py +++ b/stactools_cli/stactools/cli/commands/version.py @@ -4,9 +4,7 @@ def create_version_command(cli): - @cli.command( - 'version', - short_help='Display version info.') + @cli.command('version', short_help='Display version info.') def version_command(): """Display version info """ diff --git a/tests/cli/commands/test_version.py b/tests/cli/commands/test_version.py index 50cbbe85..5ff430eb 100644 --- a/tests/cli/commands/test_version.py +++ b/tests/cli/commands/test_version.py @@ -2,11 +2,10 @@ from stactools.core.version import __version__ from stactools.cli.commands.version import create_version_command -from tests.utils import (CliTestCase) +from tests.utils import CliTestCase class VersionTest(CliTestCase): - def create_subcommand_functions(self): return [create_version_command]