Merge pull request #1225 from common-workflow-language/moved_indent

schema_salad.validate.indent -> sourceline.indent

Author: mr-c

cwltool/procgenerator.py

@@ -2,6 +2,7 @@
 from .process import Process, shortname
 from .load_tool import load_tool
 from schema_salad import validate
+from schema_salad.sourceline import indent
 from .errors import WorkflowException
 from .context import RuntimeContext, LoadingContext
 from typing import (Any, Callable, Dict, Generator, Iterable, List,
@@ -82,7 +83,7 @@ def __init__(self,
                 _logger.exception("Validation exception")
             raise WorkflowException(
                 u"Tool definition %s failed validation:\n%s" %
-                (toolpath_object["run"], validate.indent(str(vexc))))
+                (toolpath_object["run"], indent(str(vexc))))
 
     def job(self,
             job_order,         # type: Mapping[Text, Text]
@@ -107,7 +108,7 @@ def result(self,
                 _logger.exception("Validation exception")
             raise WorkflowException(
                 u"Tool definition %s failed validation:\n%s" %
-                (jobout["runProcess"], validate.indent(str(vexc))))
+                (jobout["runProcess"], indent(str(vexc))))
 
         if "runInputs" in jobout:
             runinputs = cast(MutableMapping[Text, Any], jobout["runInputs"])

cwltool/workflow.py

@@ -15,7 +15,7 @@
 import threading
 from ruamel.yaml.comments import CommentedMap
 from schema_salad import validate
-from schema_salad.sourceline import SourceLine
+from schema_salad.sourceline import SourceLine, indent
 from six import string_types, iteritems
 from six.moves import range
 from future.utils import raise_from
@@ -644,7 +644,7 @@ def __init__(self,
                 _logger.exception("Validation exception")
             raise_from(WorkflowException(
                 u"Tool definition %s failed validation:\n%s" %
-                (toolpath_object["run"], validate.indent(str(vexc)))), vexc)
+                (toolpath_object["run"], indent(str(vexc)))), vexc)
 
         validation_errors = []
         self.tool = toolpath_object = copy.deepcopy(toolpath_object)