Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: do not wait for named or containerized conda envs (#1473)
* fix: do not wait for named or containerized conda envs

* added testcase draft for issue 1456

* cleanup
  • Loading branch information
johanneskoester committed Mar 11, 2022
1 parent 79788eb commit 6b1d09c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
3 changes: 3 additions & 0 deletions snakemake/jobs.py
Expand Up @@ -1015,7 +1015,10 @@ def get_wait_for_files(self):
self.dag.workflow.use_conda
and self.conda_env
and not self.conda_env.is_named
and not self.conda_env.is_containerized
):
# Named or containerized envs are not present on the host FS,
# hence we don't need to wait for them.
wait_for_files.append(self.conda_env.address)
return wait_for_files

Expand Down
22 changes: 22 additions & 0 deletions tests/test_github_issue1469/Snakefile
@@ -0,0 +1,22 @@
ruleorder: single_file > both_files


rule all:
input:
"foo.txt",
"bar.txt",


rule both_files:
output:
"foo.txt",
"bar.txt",
shell:
"if [[ -e foo.txt ]]; then exit 1; fi; touch {output}"


rule single_file:
output:
"foo.txt",
shell:
"if [[ -e foo.txt ]]; then exit 1; fi; touch {output}"

0 comments on commit 6b1d09c

Please sign in to comment.