Improve deprecated CWL versions reporting

Author: Anton Khodak

cwltool/load_tool.py

@@ -215,9 +215,10 @@ def validate_document(document_loader,  # type: Loader
         if metadata and 'cwlVersion' in metadata:
             workflowobj['cwlVersion'] = metadata['cwlVersion']
         else:
-            raise ValidationException("No cwlVersion found."
-                "Use the following syntax in your CWL document to declare "
-                "the version: cwlVersion: <version>")
+            raise ValidationException(
+                  "No cwlVersion found. "
+                  "Use the following syntax in your CWL document to declare the version: cwlVersion: <version>.\n"
+                  "Note: if this is a CWL draft-2 (pre v1.0) document then it will need to be upgraded first.")
 
     if not isinstance(workflowobj["cwlVersion"], (str, Text)):
         raise Exception("'cwlVersion' must be a string, got %s" % type(workflowobj["cwlVersion"]))
@@ -227,9 +228,14 @@ def validate_document(document_loader,  # type: Loader
         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 = []
+        for version in list(ALLUPDATES):
+            if "dev" in version:
+                version += " (with --enable-dev flag only)"
+            versions.append(version)
         versions.sort()
-        raise ValidationException("'cwlVersion' not valid. Supported CWL versions are: \n{}".format("\n".join(versions)))
+        raise ValidationException("The CWL reference runner no longer supports pre CWL v1.0 documents. "
+                                  "Supported versions are: \n{}".format("\n".join(versions)))
 
     (sch_document_loader, avsc_names) = \
         process.get_schema(workflowobj["cwlVersion"])[:2]

cwltool/update.py

@@ -120,7 +120,6 @@ def v1_0to1_1_0dev1(doc, loader, baseuri):
 }  # type: Dict[Text, Callable[[Any, Loader, Text], Tuple[Any, Text]]]
 
 DEVUPDATES = {
-    "v1.0.dev4": v1_0dev4to1_0,
     "v1.0": v1_0to1_1_0dev1,
     "v1.1.0-dev1": None
 }  # type: Dict[Text, Callable[[Any, Loader, Text], Tuple[Any, Text]]]