X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/69138b061aca4e0cbbb7dad080158205f6734e77..1010c9e519409f0eb36971df6c382fc7cc0e2732:/sdk/cwl/arvados_cwl/arvworkflow.py?ds=sidebyside diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py index f5afd387e6..ae90625102 100644 --- 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) - hints = main["hints"] if "hints" in main else [] if submit_runner_ram: + hints = main.get("hints", []) 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}) - main["hints"] = hints + main["hints"] = hints 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