projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13773-will-fail-container-status'
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
arvworkflow.py
diff --git
a/sdk/cwl/arvados_cwl/arvworkflow.py
b/sdk/cwl/arvados_cwl/arvworkflow.py
index f5afd387e63bc856a96fda6811d76c791a818438..ae90625102ff155cd67daa44d4ab4384aa996866 100644
(file)
--- a/
sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/
sdk/cwl/arvados_cwl/arvworkflow.py
@@
-52,8
+52,8
@@
def upload_workflow(arvRunner, tool, job_order, project_uuid, uuid=None,
upload_dependencies(arvRunner, name, tool.doc_loader,
packed, tool.tool["id"], False)
upload_dependencies(arvRunner, name, tool.doc_loader,
packed, tool.tool["id"], False)
- hints = main["hints"] if "hints" in main else []
if submit_runner_ram:
if submit_runner_ram:
+ hints = main.get("hints", [])
found = False
for h in hints:
if h["class"] == "http://arvados.org/cwl#WorkflowRunnerResources":
found = False
for h in hints:
if h["class"] == "http://arvados.org/cwl#WorkflowRunnerResources":
@@
-63,13
+63,13
@@
def upload_workflow(arvRunner, tool, job_order, project_uuid, uuid=None,
if not found:
hints.append({"class": "http://arvados.org/cwl#WorkflowRunnerResources",
"ramMin": submit_runner_ram})
if not found:
hints.append({"class": "http://arvados.org/cwl#WorkflowRunnerResources",
"ramMin": submit_runner_ram})
- main["hints"] = hints
+
main["hints"] = hints
body = {
"workflow": {
"name": name,
"description": tool.tool.get("doc", ""),
body = {
"workflow": {
"name": name,
"description": tool.tool.get("doc", ""),
- "definition":
json.dumps(packed, indent=2, sort_keys=True
)
+ "definition":
json.dumps(packed, sort_keys=True, indent=4, separators=(',',': ')
)
}}
if project_uuid:
body["workflow"]["owner_uuid"] = project_uuid
}}
if project_uuid:
body["workflow"]["owner_uuid"] = project_uuid