[ARVADOS] updated: 0ff7b94edaaaa07932ae757c0a2b7ba3fde026cb

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvworkflow.py | 4 ++--
 sdk/cwl/tests/test_job.py          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  0ff7b94edaaaa07932ae757c0a2b7ba3fde026cb (commit)
      from  210889a5400ac6ef247078af14c0766f3639b988 (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 0ff7b94edaaaa07932ae757c0a2b7ba3fde026cb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Sep 22 12:32:32 2016 -0400

    10081: Rename cwl.input.json to cwl.input.yml, fix test.

diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py
index ab39409..6087648 100644
--- a/sdk/cwl/arvados_cwl/arvworkflow.py
+++ b/sdk/cwl/arvados_cwl/arvworkflow.py
@@ -106,12 +106,12 @@ class ArvadosWorkflow(Workflow):
                             "entryname": "workflow.cwl",
                             "entry": yaml.safe_dump(packed).replace("\\", "\\\\").replace('$(', '\$(').replace('${', '\${')
                         }, {
-                            "entryname": "cwl.input.json",
+                            "entryname": "cwl.input.yml",
                             "entry": yaml.safe_dump(joborder_keepmount).replace("\\", "\\\\").replace('$(', '\$(').replace('${', '\${')
                         }]
                 }],
                 "hints": workflowobj["hints"],
-                "arguments": ["--no-container", "--move-outputs", "workflow.cwl#main", "cwl.input.json"]
+                "arguments": ["--no-container", "--move-outputs", "workflow.cwl#main", "cwl.input.yml"]
             }
             kwargs["loader"] = self.doc_loader
             kwargs["avsc_names"] = self.doc_schema
diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index ea694e1..fdb4520 100644
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -239,9 +239,9 @@ class TestWorkflow(unittest.TestCase):
                         'TMPDIR': '$(task.tmpdir)'},
                                'task.vwd': {
                                    'workflow.cwl': '$(task.keep)/99999999999999999999999999999999+118/workflow.cwl',
-                                   'cwl.input.json': '$(task.keep)/99999999999999999999999999999999+118/cwl.input.json'
+                                   'cwl.input.yml': '$(task.keep)/99999999999999999999999999999999+118/cwl.input.yml'
                                },
-                    'command': [u'cwltool', u'--no-container', u'--move-outputs', u'workflow.cwl', u'cwl.input.json'],
+                    'command': [u'cwltool', u'--no-container', u'--move-outputs', u'workflow.cwl#main', u'cwl.input.yml'],
                     'task.stdout': 'cwl.output.json'}]},
                 'runtime_constraints': {
                     'min_scratch_mb_per_node': 2048,

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


hooks/post-receive
--