Skip to content

Commit

Permalink
CWL container prepull: no reason to if extensions are enabled, they a…
Browse files Browse the repository at this point in the history
…re now supported by cwl-utils 0.36+
  • Loading branch information
mr-c committed Jan 13, 2025
1 parent 26b6b3a commit 9111bee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion requirements-cwl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ruamel.yaml>=0.15,<=0.19
ruamel.yaml.clib>=0.2.6
networkx!=2.8.1,<4
CacheControl[filecache]
cwl-utils>=0.32
cwl-utils>=0.36
9 changes: 1 addition & 8 deletions src/toil/cwl/cwltoil.py
Original file line number Diff line number Diff line change
Expand Up @@ -4253,14 +4253,7 @@ def main(args: Optional[list[str]] = None, stdout: TextIO = sys.stdout) -> int:

# Attempt to prepull the containers
if not options.no_prepull:
if not options.enable_ext:
# The CWL utils parser does not support cwltool extensions and will crash if encountered, so don't prepull if extensions are enabled
# See https://github.com/common-workflow-language/cwl-utils/issues/309
try_prepull(uri, runtime_context, expected_config.batchSystem)
else:
logger.debug(
"Not prepulling containers as cwltool extensions are not supported."
)
try_prepull(uri, runtime_context, expected_config.batchSystem)

options.tool_help = None
options.debug = options.logLevel == "DEBUG"
Expand Down

0 comments on commit 9111bee

Please sign in to comment.