Skip to content

Commit 85f3299

Browse files
committed
removing code that treats default container as lowest priority Hints
1 parent a0c2dae commit 85f3299

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

cwltool/main.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -701,14 +701,6 @@ def main(argsl=None, # type: List[str]
701701
if onWindows() and not args.default_container:
702702
args.default_container = "ubuntu"
703703

704-
# Making default Container as lowest priority, that should be used if nothing overrides it
705-
if args.default_container:
706-
defContainer = CommentedMap()
707-
defContainer.insert(1, "class", "DockerRequirement")
708-
defContainer.insert(0, "dockerPull", args.default_container)
709-
defContainer.insert(2, "requirement", True)
710-
args.hints=[defContainer]
711-
712704
# If caller provided custom arguments, it may be not every expected
713705
# option is set, so fill in no-op defaults to avoid crashing when
714706
# dereferencing them in args.

cwltool/utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ def get_feature(self, feature): # type: (Any, Any) -> Tuple[Any, bool]
2424
return (t, True)
2525
for t in reversed(self.hints):
2626
if t["class"] == feature:
27-
if "requirement" in t and t["requirement"] is True:
28-
return(t, True)
2927
return (t, False)
3028
return (None, None)
3129

0 commit comments

Comments
 (0)