better workaround

Author: mr-c

cwltool/process.py

@@ -14,10 +14,6 @@
 import textwrap
 import uuid
 
-try:
-    from collections.abc import Iterable # only works on python 3.3+
-except ImportError:
-    from collections import Iterable  # pylint: disable=unused-import
 from io import open
 from typing import (Any, Callable, Dict, Generator, Iterator, List,
                     Mapping, MutableMapping, MutableSequence, Optional, Set, Tuple,
@@ -57,6 +53,10 @@
 if TYPE_CHECKING:
     from .provenance import ProvenanceProfile  # pylint: disable=unused-import
 
+if PY3:
+    from collections.abc import Iterable # only works on python 3.3+
+else:
+    from collections import Iterable  # pylint: disable=unused-import
 
 class LogAsDebugFilter(logging.Filter):
     def __init__(self, name, parent):  # type: (Text, logging.Logger) -> None

cwltool/schemas/v1.1.0-dev1/CommandLineTool.yml

@@ -1,3 +1,4 @@
+saladVersion: v1.1
 $base: "https://w3id.org/cwl/cwl#"
 
 $namespaces:
@@ -100,6 +101,8 @@ $graph:
         * [Added](#LoadListingRequirement) `LoadListingRequirement`
           and [loadListing](#LoadContents) to control whether and how
           `Directory` listings should be loaded for use in expressions.
+        * The position field of the [CommandLineBinding](#CommandLineBinding) can
+          now be calculated from a CWL Expression.
 
       See also the [CWL Workflow Description, v1.1.0-dev1 changelog](Workflow.html#Changelog).
 

cwltool/schemas/v1.1.0-dev1/CommonWorkflowLanguage.yml

@@ -1,3 +1,4 @@
+saladVersion: v1.1
 $base: "https://w3id.org/cwl/cwl#"
 
 $namespaces:

cwltool/schemas/v1.1.0-dev1/Process.yml

@@ -1,3 +1,4 @@
+saladVersion: v1.1
 $base: "https://w3id.org/cwl/cwl#"
 
 $namespaces:

cwltool/schemas/v1.1.0-dev1/Workflow.yml

@@ -1,3 +1,4 @@
+saladVersion: v1.1
 $base: "https://w3id.org/cwl/cwl#"
 
 $namespaces:

tests/echo-position-expr.cwl

@@ -17,8 +17,6 @@ inputs:
 arguments:
   - position: ${return 2;}
     valueFrom: singular
-  - position: ${return null;}
-    valueFrom: "\U0001F57A"
 outputs:
   out:
     type: string

tests/test_examples.py

@@ -890,7 +890,6 @@ def test_bad_basecommand_docker():
     assert "permanentFail" in stderr, stderr
     assert error_code == 1
 
-#@pytest.mark.skipif(onWindows() and six.PY2, reason="emojis not supported with Py2 under Windows")
 def test_v1_0_position_expression():
     test_file = "tests/echo-position-expr.cwl"
     test_job = "tests/echo-position-expr-job.yml"