Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Download nf-core/rnaseq from forked repository #302

Merged
merged 5 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion host_vars/deploy/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ngi_resources: "{{ root_path }}/resources/"
sarek_tag: "3.4.2"
sarek_dest: "{{ sw_path }}/sarek/{{ sarek_tag | replace('.', '_') }}"

rnaseq_tag: "3.12.0"
rnaseq_tag: "v3.12.0_ngi_v1-rc1"
rnaseq_dest: "{{ sw_path }}/rnaseq/{{ rnaseq_tag | replace('.', '_') }}"
MatthiasZepper marked this conversation as resolved.
Show resolved Hide resolved

demultiplex_tag: "1.5.4"
Expand Down
2 changes: 1 addition & 1 deletion roles/nextflow/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
java_home: /sw/comp/java/x86_64/OracleJDK_11.0.9
nextflow_java: "{{ java_home }}"
nextflow_version_tag: 24.04.1
nextflow_version_tag: 24.04.4
nextflow_download_url: https://github.com/nextflow-io/nextflow/releases/download/v{{ nextflow_version_tag }}/nextflow
nf_schema_version: 2.1.1
nextflow_local_env:
Expand Down
7 changes: 4 additions & 3 deletions roles/nf-core/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
nf_core_env_name: nf-core-env
nf_core_env: "{{ sw_path }}/anaconda/envs/{{ nf_core_env_name }}"
nf_core_version: 2.14.1
nf_core_version: 3.0.2
MatthiasZepper marked this conversation as resolved.
Show resolved Hide resolved
nf_core_container_repo: docker://nfcore
nf_core_vars:
NFCORE_NO_VERSION_CHECK: 1
Expand All @@ -19,6 +19,7 @@ pipelines:
- name: rnaseq
release: "{{ rnaseq_tag }}"
container_dir: "{{ biocontainers_dirname }}"
repository: NationalGenomicsInfrastructure/nfcore_rnaseq
- name: sarek
release: "{{ sarek_tag }}"
container_dir: "{{ biocontainers_dirname }}"
Expand All @@ -44,7 +45,7 @@ pipelines:
accession: NC_001416.1
sha1: 2b03cbf38a8e6816914b172f048a2fe896317df7
- name: ampliseq
release: 2.5.0
release: 2.12.0
MatthiasZepper marked this conversation as resolved.
Show resolved Hide resolved
extra_parameters:
silva_base_url: https://www.arb-silva.de/fileadmin/silva_databases/qiime
silva_zip: Silva_132_release.zip
Expand Down Expand Up @@ -89,4 +90,4 @@ igenomes:
build: GRCh38
type: gatk

ncbi_eutils_url: https://eutils.ncbi.nlm.nih.gov/entrez/eutils
ncbi_eutils_url: https://eutils.ncbi.nlm.nih.gov/entrez/eutils
1 change: 1 addition & 0 deletions roles/nf-core/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
pipeline_genomes: "{{ item.pipeline_genomes | default([]) }}"
extra_parameters: "{{ item.extra_parameters | default({}) }}"
container_dir: "{{ ngi_containers }}/{{ item.container_dir | default(item.name) }}"
repository: "{{ item.repository | default(item.name) }}"
with_items: "{{ pipelines }}"
tags: pipelines

Expand Down
15 changes: 8 additions & 7 deletions roles/nf-core/tasks/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,24 @@
loop_control:
loop_var: cachedir

- name: nf-core download {{ pipeline }} v{{ release }}
- name: nf-core download {{ pipeline }} {{ release }}
command: >
nf-core -v
download {{ pipeline }}
-d
pipelines download {{ repository }}
--download-configuration yes
--compress none
--outdir {{ sw_path }}/{{ pipeline }}
--revision {{ release }}
--container-system singularity
--container-cache-utilisation amend
--parallel-downloads 4
environment: "{{ nf_core_vars }}"
ignore_errors: true
args:
chdir: "{{ sw_path }}"
creates: "{{ sw_path }}/{{ pipeline }}/{{ release | replace('.', '_') }}"

- name: pull pipeline-specific images for {{ pipeline }} v{{ release }}
- name: pull pipeline-specific images for {{ pipeline }} {{ release }}
command: "singularity pull --name nfcore-{{ container.0 }}.{{ container.1 }}.img {{ nf_core_container_repo }}/{{ container.0 | replace('-', ':', 1) }}.{{ container.1 }}"
environment: "{{ nf_core_vars }}"
args:
Expand All @@ -43,12 +44,12 @@
loop_control:
loop_var: container

- name: create nf-core {{ pipeline }} v{{ release }} config
- name: create nf-core {{ pipeline }} {{ release }} config
template:
src: "site.config.j2"
dest: "{{ ngi_pipeline_conf }}/{{ pipeline }}_{{ site }}.config"

- name: set alias for pipeline {{ pipeline }} v{{ release }}
- name: set alias for pipeline {{ pipeline }} {{ release }}
lineinfile:
dest: "{{ ngi_pipeline_conf }}/{{ bash_env_script }}"
line: >
Expand Down Expand Up @@ -94,4 +95,4 @@
- name: store {{ pipeline }} version in deployment
lineinfile:
dest: "{{ deployed_tool_versions }}"
line: "{{ pipeline }}: {{ release }}"
line: "{{ pipeline }}: {{ release }}"