Add support for cwltool 1.0.20180611202326

Author: nsoranzo

galaxy/tools/cwl/schema.py

@@ -53,14 +53,20 @@ def process_definition(self, raw_reference):
         return process_def
 
     def tool(self, **kwds):
+        # cwl.workflow.defaultMakeTool() method was renamed to default_make_tool() in
+        # https://github.com/common-workflow-language/cwltool/commit/886a6ac41c685f20d39e352f9c657e59f3312265
+        try:
+            default_make_tool = workflow.default_make_tool
+        except AttributeError:
+            default_make_tool = workflow.defaultMakeTool
         process_definition = kwds.get("process_definition", None)
         if process_definition is None:
             raw_process_reference = kwds.get("raw_process_reference", None)
             if raw_process_reference is None:
                 raw_process_reference = self.raw_process_reference(kwds["path"])
             process_definition = self.process_definition(raw_process_reference)
 
-        make_tool = kwds.get("make_tool", workflow.defaultMakeTool)
+        make_tool = kwds.get("make_tool", default_make_tool)
         tool = load_tool.make_tool(
             process_definition.document_loader,
             process_definition.avsc_names,