Rename draft2tool.py -> cltool.py

This is intended to deprate `draft-2 and draft-3` and thus, the rename.
Also, remove `draft-2` checking condition when validating `cwlVersion`

Author: manu-chroma

cwltool/draft2tool.py renamed to cwltool/cltool.py

@@ -175,13 +175,6 @@ def validate_document(document_loader,  # type: Loader
         raise ValidationException("No cwlVersion found."
             "Use the following syntax in your CWL workflow to declare version: cwlVersion: <version>")
 
-    if workflowobj["cwlVersion"] == "draft-2":
-        workflowobj = cast(CommentedMap, cmap(update._draft2toDraft3dev1(
-            workflowobj, document_loader, uri, update_steps=False)))
-        if "@graph" in workflowobj:
-            workflowobj["$graph"] = workflowobj["@graph"]
-            del workflowobj["@graph"]
-
     (sch_document_loader, avsc_names) = \
         process.get_schema(workflowobj["cwlVersion"])[:2]
 

cwltool/load_tool.py

@@ -23,7 +23,7 @@
 from schema_salad.ref_resolver import Fetcher, Loader, file_uri, uri_file_path
 from schema_salad.sourceline import strip_dup_lineno
 
-from . import draft2tool, workflow
+from . import cltool, workflow
 from .builder import Builder
 from .cwlrdf import printdot, printrdf
 from .errors import UnsupportedRequirement, WorkflowException
@@ -776,7 +776,7 @@ def main(argsl=None,  # type: List[str]
                 arg_parser().print_help()
                 return 1
         if args.relax_path_checks:
-            draft2tool.ACCEPTLIST_RE = draft2tool.ACCEPTLIST_EN_RELAXED_RE
+            cltool.ACCEPTLIST_RE = cltool.ACCEPTLIST_EN_RELAXED_RE
 
         if args.ga4gh_tool_registries:
             ga4gh_tool_registries[:] = args.ga4gh_tool_registries

cwltool/main.py

@@ -12,7 +12,7 @@
 from ruamel.yaml.comments import CommentedMap, CommentedSeq
 from schema_salad.sourceline import SourceLine, cmap
 
-from . import draft2tool, expression
+from . import cltool, expression
 from .errors import WorkflowException
 from .load_tool import load_tool
 from .process import Process, shortname, uniquename
@@ -33,9 +33,9 @@ def defaultMakeTool(toolpath_object,  # type: Dict[Text, Any]
         raise WorkflowException(u"Not a dict: `%s`" % toolpath_object)
     if "class" in toolpath_object:
         if toolpath_object["class"] == "CommandLineTool":
-            return draft2tool.CommandLineTool(toolpath_object, **kwargs)
+            return cltool.CommandLineTool(toolpath_object, **kwargs)
         elif toolpath_object["class"] == "ExpressionTool":
-            return draft2tool.ExpressionTool(toolpath_object, **kwargs)
+            return cltool.ExpressionTool(toolpath_object, **kwargs)
         elif toolpath_object["class"] == "Workflow":
             return Workflow(toolpath_object, **kwargs)
 

cwltool/workflow.py

@@ -2,7 +2,7 @@
 import unittest
 from mock import mock
 from cwltool.utils import windows_default_container_id
-from cwltool.draft2tool import DEFAULT_CONTAINER_MSG, CommandLineTool
+from cwltool.tool import DEFAULT_CONTAINER_MSG, CommandLineTool
 
 
 class TestDefaultDockerWarning(unittest.TestCase):