Accept v1.1 stable WIP

Author: Peter Amstutz

cwltool/executors.py

@@ -81,8 +81,7 @@ def execute(self,
                 raise WorkflowException(
                     "`cwl:requirements` in the input object is not part of CWL "
                     "v1.0. You can adjust to use `cwltool:overrides` instead; or you "
-                    "can set the cwlVersion to v1.1.0-dev1 or greater and re-run with "
-                    "--enable-dev.")
+                    "can set the cwlVersion to v1.1")
             job_reqs = job_order_object["https://w3id.org/cwl/cwl#requirements"]
         elif ("cwl:defaults" in process.metadata
               and "https://w3id.org/cwl/cwl#requirements"
@@ -91,8 +90,7 @@ def execute(self,
                 raise WorkflowException(
                     "`cwl:requirements` in the input object is not part of CWL "
                     "v1.0. You can adjust to use `cwltool:overrides` instead; or you "
-                    "can set the cwlVersion to v1.1.0-dev1 or greater and re-run with "
-                    "--enable-dev.")
+                    "can set the cwlVersion to v1.1")
             job_reqs = process.metadata["cwl:defaults"]["https://w3id.org/cwl/cwl#requirements"]
         if job_reqs is not None:
             for req in job_reqs:

cwltool/load_tool.py

@@ -259,12 +259,11 @@ def resolve_and_validate_document(loadingContext,
         del jobobj["http://commonwl.org/cwltool#overrides"]
 
     if isinstance(jobobj, CommentedMap) and "https://w3id.org/cwl/cwl#requirements" in jobobj:
-        if cwlVersion not in ("v1.1.0-dev1",):
+        if cwlVersion not in ("v1.1.0-dev1","v1.1"):
             raise ValidationException(
                     "`cwl:requirements` in the input object is not part of CWL "
                     "v1.0. You can adjust to use `cwltool:overrides` instead; or you "
-                    "can set the cwlVersion to v1.1.0-dev1 or greater and re-run with "
-                    "--enable-dev.")
+                    "can set the cwlVersion to v1.1 or greater.")
         loadingContext.overrides_list.append({"overrideTarget": uri,
                                               "requirements": jobobj["https://w3id.org/cwl/cwl#requirements"]})
         del jobobj["https://w3id.org/cwl/cwl#requirements"]

cwltool/update.py

@@ -19,9 +19,9 @@
 from .utils import visit_class, visit_field, aslist
 
 
-def v1_0to1_1_0dev1(doc, loader, baseuri):  # pylint: disable=unused-argument
+def v1_0to1_1(doc, loader, baseuri):  # pylint: disable=unused-argument
     # type: (Any, Loader, Text) -> Tuple[Any, Text]
-    """Public updater for v1.0 to v1.1.0-dev1."""
+    """Public updater for v1.0 to v1.1."""
 
     doc = copy.deepcopy(doc)
 
@@ -76,22 +76,26 @@ def fix_inputBinding(t):
         if "cwlVersion" in proc:
             del proc["cwlVersion"]
 
-    return (doc, "v1.1.0-dev1")
+    return (doc, "v1.1")
 
+def v1_1_0dev1to1_1(doc, loader, baseuri):  # pylint: disable=unused-argument
+    return (doc, "v1.1")
 
 UPDATES = {
-    u"v1.0": v1_0to1_1_0dev1
+    u"v1.0": v1_0to1_1,
+    u"v1.1": None
 }  # type: Dict[Text, Optional[Callable[[Any, Loader, Text], Tuple[Any, Text]]]]
 
 DEVUPDATES = {
-    u"v1.0": v1_0to1_1_0dev1,
-    u"v1.1.0-dev1": None
+    u"v1.0": v1_0to1_1,
+    u"v1.1.0-dev1": v1_1_0dev1to1_1,
+    u"v1.1": None
 }  # type: Dict[Text, Optional[Callable[[Any, Loader, Text], Tuple[Any, Text]]]]
 
 ALLUPDATES = UPDATES.copy()
 ALLUPDATES.update(DEVUPDATES)
 
-INTERNAL_VERSION = u"v1.1.0-dev1"
+INTERNAL_VERSION = u"v1.1"
 
 def identity(doc, loader, baseuri):  # pylint: disable=unused-argument
     # type: (Any, Loader, Text) -> Tuple[Any, Union[Text, Text]]