Skip to content

Commit 6c64d36

Browse files
committed
properly adding subparser help strings.
We need to use description and not help Signed-off-by: vsoch <[email protected]>
1 parent 7387d95 commit 6c64d36

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

shpc/client/__init__.py

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ def get_parser():
5757
)
5858

5959
# print version and exit
60-
subparsers.add_parser("version", help="show software version")
60+
subparsers.add_parser("version", description="show software version")
6161

6262
# Local shell with client loaded
6363
shell = subparsers.add_parser(
6464
"shell",
65-
help="shell into a Python session with a client.",
65+
description="shell into a Python session with a client.",
6666
formatter_class=argparse.RawTextHelpFormatter,
6767
)
6868
shell.add_argument(
@@ -82,7 +82,7 @@ def get_parser():
8282
# Install a known recipe from the registry
8383
install = subparsers.add_parser(
8484
"install",
85-
help="install a registry recipe.",
85+
description="install a registry recipe.",
8686
formatter_class=argparse.RawTextHelpFormatter,
8787
)
8888
install.add_argument(
@@ -91,7 +91,7 @@ def get_parser():
9191
)
9292

9393
# List installed modules
94-
listing = subparsers.add_parser("list", help="list installed modules.")
94+
listing = subparsers.add_parser("list", description="list installed modules.")
9595
listing.add_argument("pattern", help="filter to a pattern", nargs="?")
9696
listing.add_argument(
9797
"--names-only", help="omit versions", default=False, action="store_true"
@@ -106,7 +106,7 @@ def get_parser():
106106

107107
# List local containers and collections
108108
inspect = subparsers.add_parser(
109-
"inspect", help="inspect an installed module image."
109+
"inspect", description="inspect an installed module image."
110110
)
111111
inspect.add_argument("module_name", help="module to inspect")
112112
inspect.add_argument(
@@ -117,7 +117,7 @@ def get_parser():
117117
)
118118

119119
# Get path to an image
120-
get = subparsers.add_parser("get", help="get an image path for a module")
120+
get = subparsers.add_parser("get", description="get an image path for a module")
121121
get.add_argument("module_name", help="the name of the module")
122122
get.add_argument(
123123
"-e",
@@ -128,18 +128,20 @@ def get_parser():
128128
)
129129

130130
# Add a container direcly
131-
add = subparsers.add_parser("add", help="add an image to modules manually")
131+
add = subparsers.add_parser("add", description="add an image to modules manually")
132132
add.add_argument("sif_path", help="full path to container image file", nargs=1)
133133
add.add_argument(
134134
"module_id", help='desired identifier for module (e.g. "name/version")', nargs=1
135135
)
136136

137-
check = subparsers.add_parser("check", help="check if you have latest installed.")
137+
check = subparsers.add_parser(
138+
"check", description="check if you have latest installed."
139+
)
138140
check.add_argument("module_name", help="module to check (module:version)")
139141

140142
config = subparsers.add_parser(
141143
"config",
142-
help="update configuration settings. Use set or get to see or set information.",
144+
description="update configuration settings. Use set or get to see or set information.",
143145
formatter_class=argparse.RawTextHelpFormatter,
144146
)
145147

@@ -166,19 +168,21 @@ def get_parser():
166168
)
167169
# Generate markdown docs for a container registry entry
168170
docgen = subparsers.add_parser(
169-
"docgen", help="Generate a markdown document for a container registry entry."
171+
"docgen",
172+
description="Generate a markdown document for a container registry entry.",
170173
)
171174
docgen.add_argument("module_name", help="the module to generate docs for.")
172175

173176
# Pull a nontraditional container type (e.g., github release asset)
174177
pull = subparsers.add_parser(
175-
"pull", help="pull a container built with singularityhub/singularity-deploy"
178+
"pull",
179+
description="pull a container built with singularityhub/singularity-deploy",
176180
)
177181
pull.add_argument("uri", help="the unique resource identifier to pull")
178182
pull.add_argument("--path", help="A custom path to pull to (defaults to $PWD)")
179183

180184
# Test a registry entry
181-
test = subparsers.add_parser("test", help="test a registry entry")
185+
test = subparsers.add_parser("test", description="test a registry entry")
182186
test.add_argument("module_name", help="the module to test")
183187
test.add_argument(
184188
"--template", help="a custom test.sh template to use.", default=None
@@ -209,7 +213,7 @@ def get_parser():
209213
)
210214

211215
# Uninstall a module, or a specific version
212-
uninstall = subparsers.add_parser("uninstall", help="uninstall a module")
216+
uninstall = subparsers.add_parser("uninstall", description="uninstall a module")
213217
uninstall.add_argument(
214218
"--force",
215219
"-f",
@@ -252,15 +256,18 @@ def get_parser():
252256

253257
namespace = subparsers.add_parser(
254258
"namespace",
255-
help="set or unset the install namespace. E.g.,:\n shpc namespace set <namespace>\n shpc namespace unset",
259+
description="set or unset the install namespace. E.g.,:\n shpc namespace set <namespace>\n shpc namespace unset",
260+
formatter_class=argparse.RawTextHelpFormatter,
256261
)
257262
namespace.add_argument(
258263
"namespace",
259264
help="command (use/unset) and if use, the namespace to set",
260265
nargs="*",
261266
)
262267

263-
show = subparsers.add_parser("show", help="show the config for a registry entry.")
268+
show = subparsers.add_parser(
269+
"show", description="show the config for a registry entry."
270+
)
264271
show.add_argument(
265272
"--versions", help="include versions", default=False, action="store_true"
266273
)

0 commit comments

Comments
 (0)