Merge pull request #1273 from common-workflow-language/cwl_v1.2.0-dev3

CWL v1.2.0-dev3

Author: mr-c

.travis.yml

@@ -34,13 +34,16 @@ jobs:
       env:
        - version=v1.1
       script: ${TRAVIS_BUILD_DIR}/travis.bash
+    - python: "3.7"
+      script: RELEASE_SKIP=head ${TRAVIS_BUILD_DIR}/release-test.sh
     - python: "3.8"
       name: "CWL v1.2 conformance tests"
       env:
-       - version=v1.2.0-dev1
+       - version=v1.2.0-dev3
       script: ${TRAVIS_BUILD_DIR}/travis.bash
-    - python: "3.7"
-      script: RELEASE_SKIP=head ${TRAVIS_BUILD_DIR}/release-test.sh
+  allow_failures:
+    - python: "3.8"
+      name: "CWL v1.2 conformance tests"
 script: tox
 branches:
   only:

MANIFEST.in

@@ -28,6 +28,10 @@ include cwltool/schemas/v1.2.0-dev2/*.yml
 include cwltool/schemas/v1.2.0-dev2/*.md
 include cwltool/schemas/v1.2.0-dev2/salad/schema_salad/metaschema/*.yml
 include cwltool/schemas/v1.2.0-dev2/salad/schema_salad/metaschema/*.md
+include cwltool/schemas/v1.2.0-dev3/*.yml
+include cwltool/schemas/v1.2.0-dev3/*.md
+include cwltool/schemas/v1.2.0-dev3/salad/schema_salad/metaschema/*.yml
+include cwltool/schemas/v1.2.0-dev3/salad/schema_salad/metaschema/*.md
 include cwltool/cwlNodeEngine.js
 include cwltool/cwlNodeEngineJSConsole.js
 include cwltool/cwlNodeEngineWithContext.js

cwltool/checker.py

@@ -327,7 +327,7 @@ def check_all_types(src_dict, sinks, sourceField, param_to_step):
                     ("merge_nested" if len(sink[sourceField]) > 1 else None),
                 )
 
-                if pickValue in ["first_non_null", "only_non_null"]:
+                if pickValue in ["first_non_null", "the_only_non_null"]:
                     linkMerge = None
 
                 srcs_of_sink = []  # type: List[Any]

cwltool/main.py

@@ -613,12 +613,16 @@ def setup_schema(
         ext11 = res.read()
         use_custom_schema("v1.0", "http://commonwl.org/cwltool", ext10)
         use_custom_schema("v1.1", "http://commonwl.org/cwltool", ext11)
+        use_custom_schema("v1.2.0-dev1", "http://commonwl.org/cwltool", ext11)
         use_custom_schema("v1.2.0-dev2", "http://commonwl.org/cwltool", ext11)
+        use_custom_schema("v1.2.0-dev3", "http://commonwl.org/cwltool", ext11)
         res.close()
     else:
         use_standard_schema("v1.0")
         use_standard_schema("v1.1")
+        use_standard_schema("v1.2.0-dev1")
         use_standard_schema("v1.2.0-dev2")
+        use_standard_schema("v1.2.0-dev3")
 
 
 def setup_provenance(

cwltool/schemas/v1.2.0-dev1/CommandLineTool-standalone.yml

@@ -0,0 +1,2 @@
+- $import: Process.yml
+- $import: CommandLineTool.yml