18994: Remove commented out code
authorPeter Amstutz <peter.amstutz@curii.com>
Tue, 19 Apr 2022 14:12:36 +0000 (10:12 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Tue, 19 Apr 2022 14:12:36 +0000 (10:12 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

sdk/cwl/arvados_cwl/runner.py

index ddd1d2bacfb1bc7048c4f2d92171e0908656b3a1..e5a81cdc73fe77238b743705c1dd4c8847240d18 100644 (file)
@@ -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)