Merge pull request #632 from common-workflow-language/rollup

Rollup

Author: mr-c

cwltool/builder.py

@@ -230,7 +230,7 @@ def generate_arg(self, binding):  # type: (Dict[Text,Any]) -> List[Text]
             return [prefix] if prefix else []
         elif value is True and prefix:
             return [prefix]
-        elif value is False or value is None:
+        elif value is False or value is None or (value is True and not prefix):
             return []
         else:
             l = [value]
@@ -251,7 +251,8 @@ def do_eval(self, ex, context=None, pull_image=True, recursive=False):
                 return {k: self.do_eval(v, context, pull_image, recursive) for k, v in iteritems(ex)}
             if isinstance(ex, list):
                 return [self.do_eval(v, context, pull_image, recursive) for v in ex]
-
+        if context is None and type(ex) is str and "self" in ex:
+            return None
         return expression.do_eval(ex, self.job, self.requirements,
                                   self.outdir, self.tmpdir,
                                   self.resources,

jenkins.bash

@@ -34,14 +34,15 @@ do
 	# use pip2.7 and pip3 in separate loop runs
 	pip${PYTHON_VERSION} install -U setuptools wheel pip
 	pip${PYTHON_VERSION} install .
-	pip${PYTHON_VERSION} install "cwltest>=1.0.20160825151655"
+	pip${PYTHON_VERSION} install "cwltest>=1.0.20180130081614"
 	pushd common-workflow-language
 	# shellcheck disable=SC2154
 	if [[ "$version" = *dev* ]]
 	then
 		EXTRA="EXTRA=--enable-dev"
 	fi
-	./run_test.sh --junit-xml=result${PYTHON_VERSION}.xml RUNNER=cwltool -j4 DRAFT=${version}
+	./run_test.sh --junit-xml=result${PYTHON_VERSION}.xml RUNNER=cwltool \
+		-j4 DRAFT=${version} --classname=py${PYTHON_VERSION}
 	CODE=$(($CODE+$?)) # capture return code of ./run_test.sh
 	deactivate
 	popd