From d03b1e035fe079978416bfe10f85338b35a3d1c7 Mon Sep 17 00:00:00 2001 From: Marco De La Pierre Date: Thu, 28 Sep 2023 06:19:19 +0000 Subject: [PATCH 1/4] client/config.py: use "Unset" when value is not set Signed-off-by: Marco De La Pierre --- shpc/client/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shpc/client/config.py b/shpc/client/config.py index 495e33be8..edcdbbde2 100644 --- a/shpc/client/config.py +++ b/shpc/client/config.py @@ -47,7 +47,7 @@ def main(args, parser, extra, subparser): elif command == "get": for key in args.params: value = cli.settings.get(key) - value = "is unset" if value is None else value + value = "Unset" if value is None else value logger.info("%s %s" % (key.ljust(30), value)) else: From 37f603de87c8bc28c8694a856e86e28ea4acb9cf Mon Sep 17 00:00:00 2001 From: Marco De La Pierre Date: Thu, 28 Sep 2023 06:40:53 +0000 Subject: [PATCH 2/4] shpc config get now only prints value of key, similar to shpc view get Signed-off-by: Marco De La Pierre --- shpc/client/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shpc/client/config.py b/shpc/client/config.py index edcdbbde2..c8d6c3d97 100644 --- a/shpc/client/config.py +++ b/shpc/client/config.py @@ -48,7 +48,8 @@ def main(args, parser, extra, subparser): for key in args.params: value = cli.settings.get(key) value = "Unset" if value is None else value - logger.info("%s %s" % (key.ljust(30), value)) + # similar to view get in view.py + print(value) else: logger.error("%s is not a recognized command." % command) From 0335316da157a732ee6fb796632b5f34916effb4 Mon Sep 17 00:00:00 2001 From: Dr Marco Claudio De La Pierre Date: Tue, 10 Oct 2023 14:01:11 +0800 Subject: [PATCH 3/4] makeup change to shpc/client/config.py --- shpc/client/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shpc/client/config.py b/shpc/client/config.py index c8d6c3d97..baaca0fcf 100644 --- a/shpc/client/config.py +++ b/shpc/client/config.py @@ -47,7 +47,7 @@ def main(args, parser, extra, subparser): elif command == "get": for key in args.params: value = cli.settings.get(key) - value = "Unset" if value is None else value + value = "unset" if value is None else value # similar to view get in view.py print(value) From 794fc8d7bd81592d35b1b039fa175b6acfc82710 Mon Sep 17 00:00:00 2001 From: Dr Marco Claudio De La Pierre Date: Tue, 10 Oct 2023 14:03:29 +0800 Subject: [PATCH 4/4] bump version and changelog --- CHANGELOG.md | 1 + shpc/version.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c23ac4e..821f9a5d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are: The versions coincide with releases on pip. Only major versions will be released as tags on Github. ## [0.0.x](https://github.com/singularityhub/singularity-hpc/tree/main) (0.0.x) + - Change format of config command output to only show setting values, not keys, for parseability (0.1.25) - Allow custom location for wrapper scripts (0.1.24) - Labels with newlines need additional parsing (0.1.23) - Do not write directly to output with shpc show (0.1.22) diff --git a/shpc/version.py b/shpc/version.py index 43fac3353..25c71bdfa 100644 --- a/shpc/version.py +++ b/shpc/version.py @@ -2,7 +2,7 @@ __copyright__ = "Copyright 2021-2023, Vanessa Sochat" __license__ = "MPL 2.0" -__version__ = "0.1.24" +__version__ = "0.1.25" AUTHOR = "Vanessa Sochat" EMAIL = "vsoch@users.noreply.github.com" NAME = "singularity-hpc"