Skip to content

Commit

Permalink
Merge branch 'master' into islandpath
Browse files Browse the repository at this point in the history
* master: (97 commits)
  Use long form docker.io address for Ubuntu (nf-core#3358)
  Default registry to quay.io (nf-core#3344)
  Sbwf impute glimpse2 (nf-core#3349)
  added cellranger vdj/mkvdjref modules, with module test for vdj (nf-core#3033)
  Add space to fix singularity download error on shinyngs modules (nf-core#3351)
  Output channel modification star (nf-core#3350)
  fix corrected typo in output (nf-core#3337)
  give execution permissions to dumpsoftwareversions.py (nf-core#3347)
  fix meta.ymls for dumpsoftware and multiqc (nf-core#3345)
  Fixing failing subworkflow tests (nf-core#3343)
  remove imputeme module since it is evidently no longer supported (nf-core#3223)
  Update path for yaml-schema json (nf-core#3340)
  New module MetaPhlAn4 (nf-core#3298)
  Update ALL bcftools modules (nf-core#3339)
  update docker and singularity version of p7zip (nf-core#3338)
  update sratools/fasterqdump to handle 10X data (nf-core#3336)
  Make MAD plots optional in shinyngs (nf-core#3334)
  reset tools in CI to released version (nf-core#3335)
  new module wisecondorx/gender (nf-core#3333)
  Bump shinyngs modules (nf-core#3323)
  ...
  • Loading branch information
jvfe committed May 2, 2023
2 parents 8400519 + 38b1670 commit 95cb7c8
Show file tree
Hide file tree
Showing 557 changed files with 8,592 additions and 1,670 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/nf-core-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ jobs:
- name: Install pip
run: python -m pip install --upgrade pip

# FIXME: Remove this when nf-core modules lint stabilizes and install stable release
- name: Install nf-core tools development version
run: python -m pip install --upgrade --force-reinstall git+https://github.com/nf-core/tools.git@dev
- name: Install nf-core tools
run: python -m pip install nf-core

- name: Install Nextflow
env:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/nf-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
tags: ["${{ fromJson(needs.changes.outputs.modules) }}"]
profile: ["docker", "singularity", "conda"]
exclude:
- profile: "conda"
tags: annotsv
- profile: "conda"
tags: bases2fastq
- profile: "conda"
Expand Down
46 changes: 41 additions & 5 deletions .github/workflows/pytest-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,18 @@ jobs:
tags: ["${{ fromJson(needs.changes.outputs.modules) }}"]
profile: ["docker", "singularity", "conda"]
exclude:
- profile: "conda"
tags: annotsv
- profile: "conda"
tags: cellpose
- profile: "conda"
tags: mcquant
- profile: "conda"
tags: bases2fastq
- profile: "conda"
tags: backsub
- profile: "conda"
tags: basicpy
- profile: "conda"
tags: bcl2fastq
- profile: "conda"
Expand All @@ -58,6 +64,14 @@ jobs:
tags: cellranger/mkgtf
- profile: "conda"
tags: cellranger/mkref
- profile: "conda"
tags: cellranger/mkvdjref
- profile: "conda"
tags: cellranger/vdj
- profile: "conda"
tags: coreograph
- profile: "conda"
tags: deepcell/mesmer
- profile: "conda"
tags: deepvariant
- profile: "conda"
Expand All @@ -72,10 +86,18 @@ jobs:
tags: fcs/fcsadaptor
- profile: "conda"
tags: fcs/fcsgx
- profile: "conda"
tags: gatk4/baserecalibratorspark
- profile: "conda"
tags: gatk4/cnnscorevariants
- profile: "conda"
tags: gatk4/determinegermlinecontigploidy
- profile: "conda"
tags: gatk4/germlinecnvcaller
- profile: "conda"
tags: gatk4/markduplicatesspark
- profile: "conda"
tags: gatk4/postprocessgermlinecnvcalls
- profile: "conda"
tags: genescopefk
- profile: "conda"
Expand All @@ -92,22 +114,28 @@ jobs:
tags: merquryfk/merquryfk
- profile: "conda"
tags: merquryfk/ploidyplot
- profile: "conda"
tags: mitohifi/findmitoreference
- profile: "conda"
tags: scimap/mcmicro
- profile: "conda"
tags: sentieon/bwaindex
- profile: "conda"
tags: sentieon/bwamem
- profile: "conda"
tags: sentieon/dedup
- profile: "conda"
tags: sentieon/haplotyper
- profile: "conda"
tags: universc
- profile: "singularity"
tags: universc
- profile: "singularity"
tags: gatk4/determinegermlinecontigploidy
- profile: "conda"
tags: subworkflows/vcf_annotate_ensemblvep
- profile: "conda"
tags: coreograph
tags: subworkflows/bcl_demultiplex
- profile: "conda"
tags: scimap/mcmicro
tags: subworkflows/vcf_annotate_ensemblvep
- profile: "conda"
tags: islandpath
env:
Expand Down Expand Up @@ -190,11 +218,19 @@ jobs:
sudo apt-get install bat > /dev/null
batcat --decorations=always --color=always /home/runner/pytest_workflow_*/*/log.{out,err}
- name: Setting global variables
uses: actions/github-script@v6
id: parsed
with:
script: |
return '${{ matrix.tags }}'.toLowerCase().replaceAll(/\//g, '-').trim('-').trim('"')
result-encoding: string

- name: Upload logs on failure
if: failure()
uses: actions/upload-artifact@v2
with:
name: logs-${{ matrix.profile }}
name: logs-${{ matrix.profile }}-${{ steps.parsed.outputs.result }}
path: |
/home/runner/pytest_workflow_*/*/.nextflow.log
/home/runner/pytest_workflow_*/*/log.out
Expand Down
8 changes: 6 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ repos:
hooks:
- id: prettier
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.21.0
rev: 0.22.0
hooks:
- id: check-jsonschema
# match meta.ymls in one of the subdirectories of modules/nf-core
files: ^modules/nf-core/.*/meta\.yml$
args: ["--schemafile", "yaml-schema.json"]
args: ["--schemafile", "modules/yaml-schema.json"]
- id: check-jsonschema
# match meta.ymls in one of the subdirectories of subworkflows/nf-core
files: ^subworkflows/nf-core/.*/meta\.yml$
args: ["--schemafile", "subworkflows/yaml-schema.json"]
Empty file removed logg
Empty file.
70 changes: 70 additions & 0 deletions modules/nf-core/annotsv/annotsv/main.nf
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
process ANNOTSV_ANNOTSV {
tag "$meta.id"
label 'process_low'

conda "bioconda::annotsv=3.3.4"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/annotsv:3.3.4--py311hdfd78af_1' :
'quay.io/biocontainers/annotsv:3.3.4--py311hdfd78af_1' }"

input:
tuple val(meta), path(sv_vcf), path(sv_vcf_index), path(candidate_small_variants)
tuple val(meta2), path(annotations)
tuple val(meta3), path(candidate_genes)
tuple val(meta4), path(false_positive_snv)
tuple val(meta5), path(gene_transcripts)

output:
tuple val(meta), path("*.tsv") , emit: tsv
tuple val(meta), path("*.unannotated.tsv") , emit: unannotated_tsv, optional: true
tuple val(meta), path("*.vcf") , emit: vcf, optional: true
path "versions.yml" , emit: versions

when:
task.ext.when == null || task.ext.when

script:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"

def cand_genes = candidate_genes ? "-candidateGenesFile ${candidate_genes}" : ""
def small_variants = candidate_small_variants ? "-candidateSnvIndelFiles ${candidate_small_variants}" : ""
def fp_snv = false_positive_snv ? "-snvIndelFiles ${false_positive_snv}" : ""
def transcripts = gene_transcripts ? "-txFile ${gene_transcripts}" : ""

"""
AnnotSV \\
-annotationsDir ${annotations} \\
${cand_genes} \\
${small_variants} \\
${fp_snv} \\
${transcripts} \\
-outputFile ${prefix}.tsv \\
-SVinputFile ${sv_vcf} \\
${args}
mv *_AnnotSV/* .
cat <<-END_VERSIONS > versions.yml
"${task.process}":
annotsv: \$(echo \$(AnnotSV -help 2>&1 | head -n1 | sed 's/^AnnotSV //'))
END_VERSIONS
"""

stub:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"

def create_vcf = args.contains("-vcf 1") ? "touch ${prefix}.vcf" : ""

"""
touch ${prefix}.tsv
touch ${prefix}.unannotated.tsv
${create_vcf}
cat <<-END_VERSIONS > versions.yml
"${task.process}":
annotsv: \$(echo \$(AnnotSV -help 2>&1 | head -n1 | sed 's/^AnnotSV //'))
END_VERSIONS
"""
}
94 changes: 94 additions & 0 deletions modules/nf-core/annotsv/annotsv/meta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
name: "annotsv_annotsv"
description: Annotation and Ranking of Structural Variation
keywords:
- annotation
- structural variants
- vcf
- bed
- tsv
tools:
- "annotsv":
description: "Annotation and Ranking of Structural Variation"
homepage: "https://lbgi.fr/AnnotSV/"
documentation: "https://lbgi.fr/AnnotSV/"
tool_dev_url: "https://github.com/lgmgeo/AnnotSV"
licence: "GPL-3.0"

input:
- meta:
type: map
description: |
Groovy Map containing sample information
e.g. [ id:'test', single_end:false ]
- sv_vcf:
type: file
description: A VCF or BED file containing the structural variants to be annotated
pattern: "*.{bed,vcf,vcf.gz}"
- sv_vcf_index:
type: file
description: OPTIONAL - The index for gzipped VCF files
pattern: "*.tbi"
- candidate_small_variants:
type: file
description: OPTIONAL - A file containing candidate small variants
pattern: "*.{vcf,vcf.gz}"
- meta2:
type: map
description: |
Groovy Map containing annotations information
- annotations:
type: directory
description: |
The directory containing the annotations (URL to download this will be made available soon)
For now this can be downloaded in the way defined in the repo (https://github.com/lgmgeo/AnnotSV#quick-installation)
- meta3:
type: map
description: |
Groovy Map containing candidate genes information
- candidate_genes:
type: file
description: OPTIONAL - A file containing genes (either space-separated, tab-separated or line-break-separated)
pattern: "*.txt"
- meta4:
type: map
description: |
Groovy Map containing candidate false positive SNV information
- false_positive_snv:
type: file
description: OPTIONAL - A VCF file containing small variant candidates
pattern: "*.{vcf,vcf.gz}"
- meta5:
type: map
description: |
Groovy Map containing candidate gene transcripts information
- gene_transcripts:
type: file
description: OPTIONAL - A file containing the preferred gene transcripts to be used in priority during annotation (either space-separated or tab-separated)
pattern: "*.txt"

output:
- meta:
type: map
description: |
Groovy Map containing sample information
e.g. [ id:'test', single_end:false ]
- versions:
type: file
description: File containing software versions
pattern: "versions.yml"
- tsv:
type: file
description: A TSV file containing the annotated variants
pattern: "*.tsv"
- unannotated_tsv:
type: file
description: OPTIONAL - TSV file containing the unannotated variants
pattern: "*.unannotated.tsv"
- vcf:
type: file
description: |
OPTIONAL - A VCF file containing the annotated variants (created when `-vcf 1` is specified in the args)
pattern: "*.vcf"

authors:
- "@nvnieuwk"
36 changes: 36 additions & 0 deletions modules/nf-core/annotsv/installannotations/main.nf
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
process ANNOTSV_INSTALLANNOTATIONS {
tag 'AnnotSV annotations'
label 'process_single'

conda "bioconda::annotsv=3.3.4"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/annotsv:3.3.4--py311hdfd78af_1':
'quay.io/biocontainers/annotsv:3.3.4--py311hdfd78af_1' }"

output:
path "AnnotSV_annotations", emit: annotations
path "versions.yml" , emit: versions

when:
task.ext.when == null || task.ext.when

script:
"""
INSTALL_annotations.sh
cat <<-END_VERSIONS > versions.yml
"${task.process}":
annotsv: \$(echo \$(AnnotSV --version | sed 's/AnnotSV //'))
END_VERSIONS
"""

stub:
"""
mkdir AnnotSV_annotations
cat <<-END_VERSIONS > versions.yml
"${task.process}":
annotsv: \$(echo \$(AnnotSV --version | sed 's/AnnotSV //'))
END_VERSIONS
"""
}
27 changes: 27 additions & 0 deletions modules/nf-core/annotsv/installannotations/meta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "annotsv_installannotations"
description: Install the AnnotSV annotations
keywords:
- annotation
- download
- installation
- structural variants
tools:
- "annotsv":
description: "Annotation and Ranking of Structural Variation"
homepage: "https://lbgi.fr/AnnotSV/"
documentation: "https://lbgi.fr/AnnotSV/"
tool_dev_url: "https://github.com/lgmgeo/AnnotSV"
licence: "['GPL v3']"

output:
- versions:
type: file
description: File containing software versions
pattern: "versions.yml"
- annotations:
type: file
description: A folder containing the annotations
pattern: "AnnotSV_annotations"

authors:
- "@nvnieuwk"
Loading

0 comments on commit 95cb7c8

Please sign in to comment.