Fix --print-pre to print document prior to validation. Bump salad version for

bugfix.  Passes draft-4.dev1 tests using new syntax.

Author: Peter Amstutz

cwltool/load_tool.py

@@ -35,7 +35,8 @@ def fetch_document(argsworkflow):
     return document_loader, workflowobj, uri
 
 
-def validate_document(document_loader, workflowobj, uri, enable_dev=False, strict=True):
+def validate_document(document_loader, workflowobj, uri,
+                      enable_dev=False, strict=True, preprocess_only=False):
     jobobj = None
     if "cwl:tool" in workflowobj:
         jobobj = workflowobj
@@ -67,7 +68,13 @@ def validate_document(document_loader, workflowobj, uri, enable_dev=False, stric
         raise avsc_names
 
     workflowobj["id"] = fileuri
-    processobj, metadata = schema.load_and_validate(document_loader, avsc_names, workflowobj, strict)
+    processobj, metadata = document_loader.resolve_all(workflowobj, fileuri)
+
+    if preprocess_only:
+        return document_loader, avsc_names, processobj, metadata, uri
+
+    document_loader.validate_links(processobj)
+    schema.validate_doc(avsc_names, processobj, document_loader, strict)
 
     if not metadata:
         metadata = {"$namespaces": processobj.get("$namespaces", {}),

cwltool/main.py

@@ -469,7 +469,8 @@ def main(argsl=None,
         document_loader, avsc_names, processobj, metadata, uri = validate_document(document_loader,
                                                                                    workflowobj, uri,
                                                                                    enable_dev=args.enable_dev,
-                                                                                   strict=args.strict)
+                                                                                   strict=args.strict,
+                                                                                   preprocess_only=args.print_pre)
 
         if args.print_pre:
             stdout.write(json.dumps(processobj, indent=4))

setup.py

@@ -41,7 +41,7 @@
           'rdflib >= 4.1.0',
           'rdflib-jsonld >= 0.3.0',
           'shellescape',
-          'schema-salad==1.10.20160505185111',
+          'schema-salad==1.11.20160506154702',
           'typing'
         ],
       test_suite='tests',