Update against latest galaxy-lib.

In return it needed to be updated for recent changes to cwltool and Galaxy.
This commit is contained in:
John Chilton
2016-06-13 15:03:11 -04:00
parent 20f035dce8
commit 1a47485197
3 changed files with 7 additions and 2 deletions
+1 -1
View File
@@ -237,8 +237,8 @@ class JobProxy(object):
if self._cwl_job is None:
self._cwl_job = self._tool_proxy._tool.job(
self._input_dict,
self._job_directory,
self._output_callback,
basedir=self._job_directory,
use_container=False
).next()
self._is_command_line_job = hasattr(self._cwl_job, "command_line")
-1
View File
@@ -61,7 +61,6 @@ class SchemaLoader(object):
tool = load_tool.make_tool(
process_definition.document_loader,
process_definition.avsc_names,
process_definition.process_object,
process_definition.metadata,
process_definition.raw_process_reference.uri,
make_tool,
+6
View File
@@ -60,6 +60,12 @@ class CwlToolSource(ToolSource):
return environment_variables
def parse_edam_operations(self):
return []
def parse_edam_topics(self):
return []
def parse_help(self):
return self.tool_proxy.description() or ""