[ARVADOS] updated: 0cd8810c6969b16fb447e6a7429d9e30dc4d9ddb

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/runner.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

       via  0cd8810c6969b16fb447e6a7429d9e30dc4d9ddb (commit)
      from  8de0a9370ccbc012ac752d5c3821121b0701119d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0cd8810c6969b16fb447e6a7429d9e30dc4d9ddb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 18 17:46:54 2017 -0500

    10812: Handle $schema references.

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 437e925..53a4a6c 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -98,6 +98,10 @@ 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})
+
     mapper = ArvPathMapper(arvrunner, sc, "",
                            "keep:%s",
                            "keep:%s/%s",
@@ -109,6 +113,12 @@ def upload_dependencies(arvrunner, name, document_loader,
     adjustFileObjs(workflowobj, setloc)
     adjustDirObjs(workflowobj, setloc)
 
+    if "$schemas" in workflowobj:
+        sch = []
+        for s in workflowobj["$schemas"]:
+            sch.append(mapper.mapper(s).resolved)
+        workflowobj["$schemas"] = sch
+
     return mapper
 
 

-----------------------------------------------------------------------


hooks/post-receive
--