Skip to content

Rollup #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2018
Merged

Rollup #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
835c424
Add nothing to command line if prefix is absent for boolean
Jan 28, 2018
af70f76
Do not evaluate expressions with `self` if input object is null
Jan 28, 2018
5c1e576
tag pyversion into test results
mr-c Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cwltool/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions jenkins.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down