Skip to content

Commit 952af38

Browse files
committed
Single quote instead of backticks in output
While backticks are good for reStructuredText Docstring formatting (PEP-0287) they aren't appropriate for printing to the user
1 parent d348729 commit 952af38

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

cwltool/argparser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def arg_parser(): # type: () -> argparse.ArgumentParser
193193
parser.add_argument("--default-container",
194194
help="Specify a default docker container that will be used if the workflow fails to specify one.")
195195
parser.add_argument("--no-match-user", action="store_true",
196-
help="Disable passing the current uid to 'docker run --user`")
196+
help="Disable passing the current uid to `docker run --user`")
197197
parser.add_argument("--disable-net", action="store_true",
198198
help="Use docker's default networking for containers;"
199199
" the default is to enable networking.")

cwltool/draft2tool.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ def revmap_file(builder, outdir, f):
151151
return f
152152

153153

154-
raise WorkflowException(u"Output File object is missing both `location` and `path` fields: %s" % f)
154+
raise WorkflowException(u"Output File object is missing both 'location' "
155+
"and 'path' fields: %s" % f)
155156

156157

157158
class CallbackJob(object):

cwltool/process.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ def fillInDefaults(inputs, job):
401401
elif job.get(fieldname) is None and u"null" in aslist(inp[u"type"]):
402402
job[fieldname] = None
403403
else:
404-
raise WorkflowException("Missing required input parameter `%s`" % shortname(inp["id"]))
404+
raise WorkflowException("Missing required input parameter '%s'" % shortname(inp["id"]))
405405

406406

407407
def avroize_type(field_type, name_prefix=""):
@@ -506,7 +506,8 @@ def __init__(self, toolpath_object, **kwargs):
506506
del c["id"]
507507

508508
if "type" not in c:
509-
raise validate.ValidationException(u"Missing `type` in parameter `%s`" % c["name"])
509+
raise validate.ValidationException(u"Missing 'type' in "
510+
"parameter '%s'" % c["name"])
510511

511512
if "default" in c and "null" not in aslist(c["type"]):
512513
c["type"] = ["null"] + aslist(c["type"])
@@ -522,15 +523,17 @@ def __init__(self, toolpath_object, **kwargs):
522523
self.inputs_record_schema = cast(Dict[six.text_type, Any], schema_salad.schema.make_valid_avro(self.inputs_record_schema, {}, set()))
523524
AvroSchemaFromJSONData(self.inputs_record_schema, self.names)
524525
except avro.schema.SchemaParseException as e:
525-
raise validate.ValidationException(u"Got error `%s` while processing inputs of %s:\n%s" %
526+
raise validate.ValidationException(u"Got error '%s' while "
527+
"processing inputs of %s:\n%s" %
526528
(Text(e), self.tool["id"],
527529
json.dumps(self.inputs_record_schema, indent=4)))
528530

529531
try:
530532
self.outputs_record_schema = cast(Dict[six.text_type, Any], schema_salad.schema.make_valid_avro(self.outputs_record_schema, {}, set()))
531533
AvroSchemaFromJSONData(self.outputs_record_schema, self.names)
532534
except avro.schema.SchemaParseException as e:
533-
raise validate.ValidationException(u"Got error `%s` while processing outputs of %s:\n%s" %
535+
raise validate.ValidationException(u"Got error '%s' while "
536+
"processing outputs of %s:\n%s" %
534537
(Text(e), self.tool["id"],
535538
json.dumps(self.outputs_record_schema, indent=4)))
536539

cwltool/workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def defaultMakeTool(toolpath_object, # type: Dict[Text, Any]
3030
):
3131
# type: (...) -> Process
3232
if not isinstance(toolpath_object, dict):
33-
raise WorkflowException(u"Not a dict: `%s`" % toolpath_object)
33+
raise WorkflowException(u"Not a dict: '%s'" % toolpath_object)
3434
if "class" in toolpath_object:
3535
if toolpath_object["class"] == "CommandLineTool":
3636
return draft2tool.CommandLineTool(toolpath_object, **kwargs)

0 commit comments

Comments
 (0)