Skip to content

Commit

Permalink
updating key
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <vsochat@stanford.edu>
  • Loading branch information
vsoch committed Oct 20, 2020
1 parent 540386a commit b4deb3a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
env
.env
.eggs
images
misc
Expand Down
2 changes: 1 addition & 1 deletion snakemake/executors/google_lifesciences.py
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ def _generate_job_action(self, job):
commands = [
"/bin/bash",
"-c",
"mkdir -p /workdir && cd /workdir && wget -O /download.py https://gist.githubusercontent.com/vsoch/f5a6a6d1894be1e67aa4156c5b40c8e9/raw/a4e9ddbeba20996ca62745fcd4d9ecd7bfa3b311/gls.py && chmod +x /download.py && source activate snakemake || true && python /download.py download %s %s /tmp/workdir.tar.gz && tar -xzvf /tmp/workdir.tar.gz && %s"
"mkdir -p /workdir && cd /workdir && wget -O /download.py https://raw.githubusercontent.com/snakemake/snakemake/master/snakemake/executors/google_lifesciences_helper.py && chmod +x /download.py && source activate snakemake || true && python /download.py download %s %s /tmp/workdir.tar.gz && tar -xzvf /tmp/workdir.tar.gz && %s"
% (self.bucket.name, self.pipeline_package, exec_job),
]

Expand Down
2 changes: 1 addition & 1 deletion snakemake/remote/GS.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def bucket_name(self):
def key(self):
key = self.parse().group("key")
f = self.local_file()
if os.path.exists(f) and os.path.isdir(f):
if snakemake.io.is_flagged(f, "directory"):
key = key if f.endswith("/") else key + "/"
return key

Expand Down

0 comments on commit b4deb3a

Please sign in to comment.