From: Peter Amstutz Date: Tue, 19 Apr 2022 14:12:36 +0000 (-0400) Subject: 18994: Remove commented out code X-Git-Tag: 2.5.0~199^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/97fc7b68a8777794e1beb2c93a1c5c7880f1f0df 18994: Remove commented out code Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py index ddd1d2bacf..e5a81cdc73 100644 --- a/sdk/cwl/arvados_cwl/runner.py +++ b/sdk/cwl/arvados_cwl/runner.py @@ -353,25 +353,13 @@ def upload_dependencies(arvrunner, name, document_loader, if include_primary and "id" in workflowobj: sc.append({"class": "File", "location": workflowobj["id"]}) - #if "$schemas" in workflowobj: - # for s in workflowobj["$schemas"]: - # sc.append({"class": "File", "location": s}) - def visit_default(obj): - #remove = [False] - def ensure_default_location(f): + def defaults_are_optional(f): if "location" not in f and "path" in f: f["location"] = f["path"] del f["path"] optional_deps.append(f) - #if "location" in f and not arvrunner.fs_access.exists(f["location"]): - # # Doesn't exist, remove from list of dependencies to upload - # sc[:] = [x for x in sc if x["location"] != f["location"]] - # # Delete "default" from workflowobj - # remove[0] = True - visit_class(obj["default"], ("File", "Directory"), ensure_default_location) - #if remove[0]: - # del obj["default"] + visit_class(obj["default"], ("File", "Directory"), defaults_are_optional) find_defaults(workflowobj, visit_default)