Add --cwl_engine argument to cwl_run.

jmchilton · jmchilton · commit dd94ddcd2d47 · 2015-11-05T19:10:43.000Z
Allow running the reference implementation using planemo.
diff --git a/planemo/commands/cmd_cwl_run.py b/planemo/commands/cmd_cwl_run.py
@@ -26,4 +26,8 @@ def cli(ctx, path, job_path, **kwds):
 
         % planemo cwl_run cat1-tool.cwl cat-job.json
     """
-    return cwl.run_galaxy(ctx, path, job_path, **kwds)
+    engine = kwds.get("cwl_engine", "galaxy")
+    if engine == "galaxy":
+        return cwl.run_galaxy(ctx, path, job_path, **kwds)
+    else:
+        return cwl.run_cwltool(ctx, path, job_path, **kwds)
diff --git a/planemo/cwl/__init__.py b/planemo/cwl/__init__.py
@@ -1,5 +1,6 @@
-from .client import run_cwl_tool
+from .run import run_galaxy, run_cwltool
 
 __all__ = [
-    'run_cwl_tool',
+    'run_galaxy',
+    'run_cwltool',
 ]
diff --git a/planemo/cwl/run.py b/planemo/cwl/run.py
@@ -1,3 +1,9 @@
+from planemo.io import conditionally_captured_io
+from planemo import galaxy_serve
+from .client import run_cwl_tool
+from planemo import io
+
+from cwltool.main import main
 
 
 def run_galaxy(ctx, path, job_path, **kwds):
@@ -6,11 +12,23 @@ def run_galaxy(ctx, path, job_path, **kwds):
     with conditionally_captured_io(conformance_test):
         with galaxy_serve.serve_daemon(ctx, [path], **kwds) as config:
             try:
-                cwl_run = cwl.run_cwl_tool(path, job_path, config, **kwds)
+                cwl_run = run_cwl_tool(path, job_path, config, **kwds)
             except Exception:
                 io.warn("Problem running cwl tool...")
                 print(config.log_contents)
                 raise
 
     print(cwl_run.cwl_command_state)
     return 0
+
+
+def run_cwltool(ctx, path, job_path, **kwds):
+    args = []
+    if kwds.get("conformance_test", False):
+        args.append("--conformance-test")
+    if ctx.verbose:
+        args.append("--verbose")
+
+    args.extend([path, job_path])
+    ctx.vlog("Calling cwltool with arguments %s" % args)
+    return main(args)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`		`-from .client import run_cwl_tool`
	`1`	`+from .run import run_galaxy, run_cwltool`
`2`	`2`
`3`	`3`	`__all__ = [`
`4`		`- 'run_cwl_tool',`
	`4`	`+ 'run_galaxy',`
	`5`	`+ 'run_cwltool',`
`5`	`6`	`]`