Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
<!-- Ensure that the PR title follows conventional commit style (<type>:
<description>)-->
<!-- Possible types are here:
https://github.com/commitizen/conventional-commit-types/blob/master/index.json
-->

<!-- Add a description of your PR here-->
Allow for custom URLs (fix issues snakemake#366 and snakemake#2649).

### QC
<!-- Make sure that you can tick the boxes below. -->

* [x] I confirm that:

For all wrappers added by this PR, 

* there is a test case which covers any introduced changes,
* `input:` and `output:` file paths in the resulting rule can be changed
arbitrarily,
* either the wrapper can only use a single core, or the example rule
contains a `threads: x` statement with `x` being a reasonable default,
* rule names in the test case are in
[snake_case](https://en.wikipedia.org/wiki/Snake_case) and somehow tell
what the rule is about or match the tools purpose or name (e.g.,
`map_reads` for a step that maps reads),
* all `environment.yaml` specifications follow [the respective best
practices](https://stackoverflow.com/a/64594513/2352071),
* the `environment.yaml` pinning has been updated by running
`snakedeploy pin-conda-envs environment.yaml` on a linux machine,
* wherever possible, command line arguments are inferred and set
automatically (e.g. based on file extensions in `input:` or `output:`),
* all fields of the example rules in the `Snakefile`s and their entries
are explained via comments (`input:`/`output:`/`params:` etc.),
* `stderr` and/or `stdout` are logged correctly (`log:`), depending on
the wrapped tool,
* temporary files are either written to a unique hidden folder in the
working directory, or (better) stored where the Python function
`tempfile.gettempdir()` points to (see
[here](https://docs.python.org/3/library/tempfile.html#tempfile.gettempdir);
this also means that using any Python `tempfile` default behavior
works),
* the `meta.yaml` contains a link to the documentation of the respective
tool or command,
* `Snakefile`s pass the linting (`snakemake --lint`),
* `Snakefile`s are formatted with
[snakefmt](https://github.com/snakemake/snakefmt),
* Python wrapper scripts are formatted with
[black](https://black.readthedocs.io).
* Conda environments use a minimal amount of channels, in recommended
ordering. E.g. for bioconda, use (conda-forge, bioconda, nodefaults, as
conda-forge should have highest priority and defaults channels are
usually not needed because most packages are in conda-forge nowadays).
  • Loading branch information
fgvieira authored May 28, 2024
1 parent f4e5b66 commit e10ab57
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 24 deletions.
2 changes: 2 additions & 0 deletions bio/reference/ensembl-annotation/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ authors:
- Johannes Köster
output:
- Ensemble GTF or GFF3 anotation file
params:
- url: URL from where to download cache data (optional; by default is ``ftp://ftp.ensembl.org/pub``)
2 changes: 2 additions & 0 deletions bio/reference/ensembl-annotation/test/Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ rule get_annotation_gz:
# branch="plants", # optional: specify branch
log:
"logs/get_annotation.log",
params:
url="http://ftp.ensembl.org/pub",
cache: "omit-software" # save space and time with between workflow caching (see docs)
wrapper:
"master/bio/reference/ensembl-annotation"
13 changes: 2 additions & 11 deletions bio/reference/ensembl-annotation/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,8 @@
)


url = "ftp://ftp.ensembl.org/pub/{branch}release-{release}/{out_fmt}/{species}/{species_cap}.{build}.{gtf_release}.{flavor}{suffix}".format(
release=release,
gtf_release=gtf_release,
build=build,
species=species,
out_fmt=out_fmt,
species_cap=species.capitalize(),
suffix=suffix,
flavor=flavor,
branch=branch,
)
url = snakemake.params.get("url", "ftp://ftp.ensembl.org/pub")
url = f"{url}/{branch}release-{release}/{out_fmt}/{species}/{species.capitalize()}.{build}.{gtf_release}.{flavor}{suffix}"


try:
Expand Down
4 changes: 4 additions & 0 deletions bio/reference/ensembl-sequence/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ name: ensembl-sequence
description: Download sequences (e.g. genome) from ENSEMBL FTP servers, and store them in a single .fasta file.
authors:
- Johannes Köster
output:
- fasta file
params:
- url: URL from where to download cache data (optional; by default is ``ftp://ftp.ensembl.org/pub``)
2 changes: 2 additions & 0 deletions bio/reference/ensembl-sequence/test/Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ rule get_single_chromosome:
# branch="plants", # optional: specify branch
log:
"logs/get_genome.log",
params:
url="http://ftp.ensembl.org/pub",
cache: "omit-software" # save space and time with between workflow caching (see docs)
wrapper:
"master/bio/reference/ensembl-sequence"
Expand Down
3 changes: 2 additions & 1 deletion bio/reference/ensembl-sequence/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@
"invalid datatype, to select a single chromosome the datatype must be dna"
)

url = snakemake.params.get("url", "ftp://ftp.ensembl.org/pub")
spec = spec.format(build=build, release=release)
url_prefix = f"ftp://ftp.ensembl.org/pub/{branch}release-{release}/fasta/{species}/{datatype}/{species.capitalize()}.{spec}"
url_prefix = f"{url}/{branch}release-{release}/fasta/{species}/{datatype}/{species.capitalize()}.{spec}"

success = False
for suffix in suffixes:
Expand Down
4 changes: 4 additions & 0 deletions bio/reference/ensembl-variation/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ name: ensembl-variation
description: Download known genomic variants from ENSEMBL FTP servers, and store them in a single .vcf.gz file.
authors:
- Johannes Köster
output:
- VCF file
params:
- url: URL from where to download cache data (optional; by default is ``ftp://ftp.ensembl.org/pub``)
2 changes: 2 additions & 0 deletions bio/reference/ensembl-variation/test/Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ rule get_variation:
type="all", # one of "all", "somatic", "structural_variation"
# chromosome="21", # optionally constrain to chromosome, only supported for homo_sapiens
# branch="plants", # optional: specify branch
params:
url="http://ftp.ensembl.org/pub",
log:
"logs/get_variation.log",
cache: "omit-software" # save space and time with between workflow caching (see docs)
Expand Down
10 changes: 3 additions & 7 deletions bio/reference/ensembl-variation/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,12 @@

species_filename = species if release >= 91 else species.capitalize()

url = snakemake.params.get("url", "ftp://ftp.ensembl.org/pub")
urls = [
"ftp://ftp.ensembl.org/pub/{branch}release-{release}/variation/vcf/{species}/{species_filename}{suffix}.vcf.gz".format(
release=release,
species=species,
suffix=suffix,
species_filename=species_filename,
branch=branch,
)
f"{url}/{branch}release-{release}/variation/vcf/{species}/{species_filename}{suffix}.vcf.gz"
for suffix in suffixes
]

names = [os.path.basename(url) for url in urls]

try:
Expand Down
7 changes: 7 additions & 0 deletions bio/vep/cache/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ description: Download VEP cache for given species, build and release.
url: http://www.ensembl.org/info/docs/tools/vep/index.html
authors:
- Johannes Köster
output:
- directory to store the VEP cache
params:
- url: URL from where to download cache data (optional; by default is ``ftp://ftp.ensembl.org/pub``)
- species: species to download cache data
- build: build to download cache data
- release: release to download cache data
15 changes: 15 additions & 0 deletions bio/vep/cache/test/Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,18 @@ rule get_vep_cache:
cache: "omit-software" # save space and time with between workflow caching (see docs)
wrapper:
"master/bio/vep/cache"


rule get_vep_cache_ebi:
output:
directory("resources/vep/cache_ebi"),
params:
url="ftp://ftp.ebi.ac.uk/ensemblgenomes/pub/plants",
species="cyanidioschyzon_merolae",
build="ASM9120v1",
release="58",
log:
"logs/vep/cache_ebi.log",
cache: "omit-software" # save space and time with between workflow caching (see docs)
wrapper:
"master/bio/vep/cache"
11 changes: 6 additions & 5 deletions bio/vep/cache/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@


extra = snakemake.params.get("extra", "")
log = snakemake.log_fmt_shell(stdout=True, stderr=True)


try:
release = int(snakemake.params.release)
except ValueError:
raise ValueError("The parameter release is supposed to be an integer.")


with tempfile.TemporaryDirectory() as tmpdir:
# We download the cache tarball manually because vep_install does not consider proxy settings (in contrast to curl).
# See https://github.com/bcbio/bcbio-nextgen/issues/1080
vep_dir = "vep" if release >= 97 else "VEP"
cache_url = snakemake.params.get("url", "ftp://ftp.ensembl.org/pub")
cache_tarball = (
f"{snakemake.params.species}_vep_{release}_{snakemake.params.build}.tar.gz"
)
log = snakemake.log_fmt_shell(stdout=True, stderr=True)
vep_dir = "vep" if snakemake.params.get("url") or release >= 97 else "VEP"
shell(
"curl -L ftp://ftp.ensembl.org/pub/release-{snakemake.params.release}/"
"variation/{vep_dir}/{cache_tarball} "
"-o {tmpdir}/{cache_tarball} {log}"
"curl -L {cache_url}/release-{release}/variation/{vep_dir}/{cache_tarball} -o {tmpdir}/{cache_tarball} {log}"
)

log = snakemake.log_fmt_shell(stdout=True, stderr=True, append=True)
Expand Down
5 changes: 5 additions & 0 deletions test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5965,6 +5965,11 @@ def test_vep_cache():
["snakemake", "--cores", "1", "resources/vep/cache", "--use-conda", "-F"],
)

run(
"bio/vep/cache",
["snakemake", "--cores", "1", "resources/vep/cache_ebi", "--use-conda", "-F"],
)


@skip_if_not_modified
def test_vep_plugins():
Expand Down

0 comments on commit e10ab57

Please sign in to comment.