From c10f9eb817b8aa6c2f1ef43c08a18e54137580fc Mon Sep 17 00:00:00 2001 From: "Robert A. Petit III" Date: Mon, 8 Nov 2021 12:52:07 -0700 Subject: [PATCH] add lissero module (#1026) * add lissero module * Update test.yml Co-authored-by: Gregor Sturm --- modules/lissero/functions.nf | 78 +++++++++++++++++++++++++++++++++ modules/lissero/main.nf | 41 +++++++++++++++++ modules/lissero/meta.yml | 44 +++++++++++++++++++ tests/config/pytest_modules.yml | 4 ++ tests/modules/lissero/main.nf | 13 ++++++ tests/modules/lissero/test.yml | 7 +++ 6 files changed, 187 insertions(+) create mode 100644 modules/lissero/functions.nf create mode 100644 modules/lissero/main.nf create mode 100644 modules/lissero/meta.yml create mode 100644 tests/modules/lissero/main.nf create mode 100644 tests/modules/lissero/test.yml diff --git a/modules/lissero/functions.nf b/modules/lissero/functions.nf new file mode 100644 index 00000000..85628ee0 --- /dev/null +++ b/modules/lissero/functions.nf @@ -0,0 +1,78 @@ +// +// Utility functions used in nf-core DSL2 module files +// + +// +// Extract name of software tool from process name using $task.process +// +def getSoftwareName(task_process) { + return task_process.tokenize(':')[-1].tokenize('_')[0].toLowerCase() +} + +// +// Extract name of module from process name using $task.process +// +def getProcessName(task_process) { + return task_process.tokenize(':')[-1] +} + +// +// Function to initialise default values and to generate a Groovy Map of available options for nf-core modules +// +def initOptions(Map args) { + def Map options = [:] + options.args = args.args ?: '' + options.args2 = args.args2 ?: '' + options.args3 = args.args3 ?: '' + options.publish_by_meta = args.publish_by_meta ?: [] + options.publish_dir = args.publish_dir ?: '' + options.publish_files = args.publish_files + options.suffix = args.suffix ?: '' + return options +} + +// +// Tidy up and join elements of a list to return a path string +// +def getPathFromList(path_list) { + def paths = path_list.findAll { item -> !item?.trim().isEmpty() } // Remove empty entries + paths = paths.collect { it.trim().replaceAll("^[/]+|[/]+\$", "") } // Trim whitespace and trailing slashes + return paths.join('/') +} + +// +// Function to save/publish module results +// +def saveFiles(Map args) { + def ioptions = initOptions(args.options) + def path_list = [ ioptions.publish_dir ?: args.publish_dir ] + + // Do not publish versions.yml unless running from pytest workflow + if (args.filename.equals('versions.yml') && !System.getenv("NF_CORE_MODULES_TEST")) { + return null + } + if (ioptions.publish_by_meta) { + def key_list = ioptions.publish_by_meta instanceof List ? ioptions.publish_by_meta : args.publish_by_meta + for (key in key_list) { + if (args.meta && key instanceof String) { + def path = key + if (args.meta.containsKey(key)) { + path = args.meta[key] instanceof Boolean ? "${key}_${args.meta[key]}".toString() : args.meta[key] + } + path = path instanceof String ? path : '' + path_list.add(path) + } + } + } + if (ioptions.publish_files instanceof Map) { + for (ext in ioptions.publish_files) { + if (args.filename.endsWith(ext.key)) { + def ext_list = path_list.collect() + ext_list.add(ext.value) + return "${getPathFromList(ext_list)}/$args.filename" + } + } + } else if (ioptions.publish_files == null) { + return "${getPathFromList(path_list)}/$args.filename" + } +} diff --git a/modules/lissero/main.nf b/modules/lissero/main.nf new file mode 100644 index 00000000..ff863aaa --- /dev/null +++ b/modules/lissero/main.nf @@ -0,0 +1,41 @@ +// Import generic module functions +include { initOptions; saveFiles; getSoftwareName; getProcessName } from './functions' + +params.options = [:] +options = initOptions(params.options) + +process LISSERO { + tag "$meta.id" + label 'process_low' + publishDir "${params.outdir}", + mode: params.publish_dir_mode, + saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), meta:meta, publish_by_meta:['id']) } + + conda (params.enable_conda ? "bioconda::lissero=0.4.9" : null) + if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) { + container "https://depot.galaxyproject.org/singularity/lissero:0.4.9--py_0" + } else { + container "quay.io/biocontainers/lissero:0.4.9--py_0" + } + + input: + tuple val(meta), path(fasta) + + output: + tuple val(meta), path("*.tsv"), emit: tsv + path "versions.yml" , emit: versions + + script: + def prefix = options.suffix ? "${meta.id}${options.suffix}" : "${meta.id}" + """ + lissero \\ + $options.args \\ + $fasta \\ + > ${prefix}.tsv + + cat <<-END_VERSIONS > versions.yml + ${getProcessName(task.process)}: + ${getSoftwareName(task.process)}: \$( echo \$(lissero --version 2>&1) | sed 's/^.*LisSero //' ) + END_VERSIONS + """ +} diff --git a/modules/lissero/meta.yml b/modules/lissero/meta.yml new file mode 100644 index 00000000..d4fb38df --- /dev/null +++ b/modules/lissero/meta.yml @@ -0,0 +1,44 @@ +name: lissero +description: Serogrouping Listeria monocytogenes assemblies +keywords: + - fasta + - Listeria monocytogenes + - serogroup +tools: + - lissero: + description: In silico serotyping of Listeria monocytogenes + homepage: https://github.com/MDU-PHL/LisSero/blob/master/README.md + documentation: https://github.com/MDU-PHL/LisSero/blob/master/README.md + tool_dev_url: https://github.com/MDU-PHL/lissero + doi: "" + licence: ['GPL v3'] + +input: + - meta: + type: map + description: | + Groovy Map containing sample information + e.g. [ id:'test', single_end:false ] + - fasta: + type: file + description: FASTA assembly file + pattern: "*.{fasta,fasta.gz,fa,fa.gz,fna,fna.gz}" + +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: Tab-delimited result file + pattern: "*.tsv" + +authors: + - "@rpetit3" + diff --git a/tests/config/pytest_modules.yml b/tests/config/pytest_modules.yml index 146eba06..6fd80c59 100644 --- a/tests/config/pytest_modules.yml +++ b/tests/config/pytest_modules.yml @@ -714,6 +714,10 @@ lima: - modules/lima/** - tests/modules/lima/** +lissero: + - modules/lissero/** + - tests/modules/lissero/** + lofreq/call: - modules/lofreq/call/** - tests/modules/lofreq/call/** diff --git a/tests/modules/lissero/main.nf b/tests/modules/lissero/main.nf new file mode 100644 index 00000000..e653bd76 --- /dev/null +++ b/tests/modules/lissero/main.nf @@ -0,0 +1,13 @@ +#!/usr/bin/env nextflow + +nextflow.enable.dsl = 2 + +include { LISSERO } from '../../../modules/lissero/main.nf' addParams( options: [:] ) + +workflow test_lissero { + + input = [ [ id:'test', single_end:false ], // meta map + file("https://github.com/MDU-PHL/LisSero/raw/master/tests/test_seq/NC_002973.fna", checkIfExists: true) ] + + LISSERO ( input ) +} diff --git a/tests/modules/lissero/test.yml b/tests/modules/lissero/test.yml new file mode 100644 index 00000000..19e79623 --- /dev/null +++ b/tests/modules/lissero/test.yml @@ -0,0 +1,7 @@ +- name: lissero test_lissero + command: nextflow run tests/modules/lissero -entry test_lissero -c tests/config/nextflow.config + tags: + - lissero + files: + - path: output/lissero/test.tsv + contains: ['ID', 'SEROTYPE', 'FULL']