revert relocation of default_make_tool initialization

Fixes: #1525

Author: mr-c

cwltool/factory.py

@@ -1,13 +1,12 @@
 import os
 from typing import Any, Dict, Optional, Union
 
-from . import context, load_tool
+from . import load_tool
 from .context import LoadingContext, RuntimeContext
 from .errors import WorkflowException
 from .executors import JobExecutor, SingleJobExecutor
 from .process import Process
 from .utils import CWLObjectType
-from .workflow import default_make_tool
 
 
 class WorkflowStatus(Exception):
@@ -49,8 +48,6 @@ def __init__(
         loading_context: Optional[LoadingContext] = None,
         runtime_context: Optional[RuntimeContext] = None,
     ) -> None:
-        if context.default_make_tool == context.make_tool_notimpl:
-            context.default_make_tool = default_make_tool
         if executor is None:
             executor = SingleJobExecutor()
         self.executor = executor

cwltool/main.py

@@ -43,7 +43,7 @@
 from schema_salad.sourceline import strip_dup_lineno
 from schema_salad.utils import ContextType, FetcherCallableType, json_dumps, yaml_no_ts
 
-from . import CWL_CONTENT_TYPES, context, workflow
+from . import CWL_CONTENT_TYPES, workflow
 from .argparser import arg_parser, generate_parser, get_default_args
 from .builder import HasReqsHints
 from .context import LoadingContext, RuntimeContext, getdefault
@@ -96,7 +96,7 @@
     versionstring,
     visit_class,
 )
-from .workflow import Workflow, default_make_tool
+from .workflow import Workflow
 
 
 def _terminate_processes() -> None:
@@ -902,7 +902,6 @@ def main(
     runtimeContext: Optional[RuntimeContext] = None,
     input_required: bool = True,
 ) -> int:
-    context.default_make_tool = default_make_tool
     if not stdout:  # force UTF-8 even if the console is configured differently
         if hasattr(sys.stdout, "encoding") and sys.stdout.encoding.upper() not in (
             "UTF-8",

cwltool/workflow.py

@@ -19,7 +19,7 @@
 from schema_salad.exceptions import ValidationException
 from schema_salad.sourceline import SourceLine, indent
 
-from . import command_line_tool, procgenerator
+from . import command_line_tool, context, procgenerator
 from .checker import static_checker
 from .context import LoadingContext, RuntimeContext, getdefault
 from .errors import WorkflowException
@@ -61,6 +61,9 @@ def default_make_tool(
     )
 
 
+context.default_make_tool = default_make_tool
+
+
 class Workflow(Process):
     def __init__(
         self,