Merge branch 'master' into py3_conformance

Author: mr-c

cwltool/load_tool.py

@@ -162,14 +162,15 @@ def validate_document(document_loader,  # type: Loader
     if "cwlVersion" in workflowobj:
         if not isinstance(workflowobj["cwlVersion"], (str, Text)):
             raise Exception("'cwlVersion' must be a string, got %s" % type(workflowobj["cwlVersion"]))
+        # strip out version
+        workflowobj["cwlVersion"] = re.sub(
+            r"^(?:cwl:|https://w3id.org/cwl/cwl#)", "",
+            workflowobj["cwlVersion"])
         if workflowobj["cwlVersion"] not in list(ALLUPDATES):
             # print out all the Supported Versions of cwlVersion
             versions = list(ALLUPDATES) # ALLUPDATES is a dict
             versions.sort()
             raise ValidationException("'cwlVersion' not valid. Supported CWL versions are: \n{}".format("\n".join(versions)))
-        workflowobj["cwlVersion"] = re.sub(
-            r"^(?:cwl:|https://w3id.org/cwl/cwl#)", "",
-            workflowobj["cwlVersion"])
     else:
         raise ValidationException("No cwlVersion found."
             "Use the following syntax in your CWL workflow to declare version: cwlVersion: <version>")