improve types and fix import loop

Author: mr-c

cwltool/builder.py

@@ -44,7 +44,7 @@
 )
 
 if TYPE_CHECKING:
-    from .provenance import ProvenanceProfile  # pylint: disable=unused-import
+    from .provenance_profile import ProvenanceProfile  # pylint: disable=unused-import
     from .pathmapper import PathMapper
 
 

cwltool/command_line_tool.py

@@ -79,7 +79,7 @@
 )
 
 if TYPE_CHECKING:
-    from .provenance import ProvenanceProfile  # pylint: disable=unused-import
+    from .provenance_profile import ProvenanceProfile  # pylint: disable=unused-import
 
 ACCEPTLIST_EN_STRICT_RE = re.compile(r"^[a-zA-Z0-9._+-]+$")
 ACCEPTLIST_EN_RELAXED_RE = re.compile(r".*")  # Accept anything

cwltool/context.py

@@ -21,8 +21,8 @@
     from .process import Process
     from .provenance import (
         ResearchObject,  # pylint: disable=unused-import
-        ProvenanceProfile,
     )
+    from .provenance_profile import ProvenanceProfile
 
 
 class ContextBase(object):

cwltool/executors.py

@@ -32,9 +32,10 @@
 from .loghandler import _logger
 from .mutation import MutationManager
 from .process import Process, cleanIntermediate, relocateOutputs
-from .provenance import ProvenanceProfile
+from .provenance_profile import ProvenanceProfile
 from .utils import DEFAULT_TMP_PREFIX, CWLObjectType, JobsType
-from .workflow import Workflow, WorkflowJob, WorkflowJobStep
+from .workflow import Workflow
+from .workflow_job import WorkflowJob, WorkflowJobStep
 
 TMPDIR_LOCK = Lock()
 

cwltool/job.py

@@ -61,7 +61,7 @@
 )
 
 if TYPE_CHECKING:
-    from .provenance import ProvenanceProfile  # pylint: disable=unused-import
+    from .provenance_profile import ProvenanceProfile  # pylint: disable=unused-import
 needs_shell_quoting_re = re.compile(r"""(^$|[\s|&;()<>\'"$@])""")
 
 FORCE_SHELLED_POPEN = os.getenv("CWLTOOL_FORCE_SHELL_POPEN", "0") == "1"

cwltool/process.py

@@ -72,7 +72,7 @@
 from .validate_js import validate_js_expressions
 
 if TYPE_CHECKING:
-    from .provenance import ProvenanceProfile  # pylint: disable=unused-import
+    from .provenance_profile import ProvenanceProfile  # pylint: disable=unused-import
 
 
 class LogAsDebugFilter(logging.Filter):