Skip to content

Commit

Permalink
add bactopia tool for shigeifinder, start updating tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rpetit3 committed Nov 18, 2022
1 parent 3c07efa commit a8f7ea4
Show file tree
Hide file tree
Showing 23 changed files with 538 additions and 48 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -19,6 +19,7 @@ description: A full list of Bactopia releases and a description of the changes.
- Bactopia Tools (`bactopia --wf <NAME>`)
- `pasty` - in silico serogrouping of _Pseudomonas aeruginosa_ isolates
- `pbptyper` - In silico Penicillin Binding Protein (PBP) typer for _Streptococcus pneumoniae_ assemblies
- `shigeifinder` - Serotyping Shigella and EIEC assemblies

### `Fixed`
- respect short polish hybrid assembly requests
Expand Down
12 changes: 9 additions & 3 deletions conf/workflows.config
Expand Up @@ -14,8 +14,8 @@ params {
'ismapper', 'kleborate', 'kraken2', 'legsta', 'lissero', 'mashdist',
'mashtree', 'mcroni', 'meningotype', 'mlst', 'mobsuite', 'mykrobe',
'ngmaster', 'pasty', 'pbptyper', 'plasmidfinder', 'prokka', 'rgi',
'seqsero2', 'seroba', 'shigatyper', 'sistr', 'spatyper', 'ssuissero',
'staphopiasccmec', 'tbprofiler'
'seqsero2', 'seroba', 'shigatyper', 'shigeifinder', 'sistr', 'spatyper',
'ssuissero', 'staphopiasccmec', 'tbprofiler'
]
}
}
Expand Down Expand Up @@ -68,7 +68,8 @@ params {
description = "MinmER assisted species-specific bactopia tool seLectIoN"
ext = "fna_fastq"
modules = ["mashdist", "agrvate", "ectyper", "emmtyper", "genotyphi", "hicap", "hpsuissero", "kleborate", "legsta", "lissero", "meningotype",
"ngmaster", "seqsero2", "seroba", "shigatyper", "sistr", "spatyper", "ssuissero", "staphopiasccmec", "tbprofiler"]
"ngmaster", "pasty", "pbptyper", "seqsero2", "seroba", "shigatyper", "shigeifinder", "sistr", "spatyper", "ssuissero",
"staphopiasccmec", "tbprofiler"]
}
'pangenome' {
description = "Pangenome analysis with optional core-genome phylogeny"
Expand Down Expand Up @@ -353,6 +354,11 @@ params {
ext = "fastq"
path = "modules/nf-core/shigatyper"
}
'shigeifinder' {
description = "Shigella and EIEC serotyping from assemblies"
ext = "fna"
path = "modules/nf-core/shigeifinder"
}
'sistr' {
description = "Serovar prediction of Salmonella assemblies"
ext = "fna"
Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/amrfinderplus/update/main.nf
Expand Up @@ -28,7 +28,7 @@ process AMRFINDERPLUS_UPDATE {
"""
mkdir amrfinderdb
amrfinder_update -d amrfinderdb
tar czvf amrfinderdb.tar.gz -C \$(readlink amrfinderdb/latest) ./
tar czvf amrfinderdb.tar.gz -C amrfinderdb/\$(readlink amrfinderdb/latest) ./
cat <<-END_VERSIONS > versions.yml
"${task.process}":
Expand Down
3 changes: 2 additions & 1 deletion modules/nf-core/mash/dist/main.nf
Expand Up @@ -73,6 +73,7 @@ process MERLIN_DIST {
tuple val(meta), path(query), path("mycobacterium.*") , emit: mycobacterium, optional: true
tuple val(meta), path(reads), path("mycobacterium.*") , emit: mycobacterium_fq, optional: true
tuple val(meta), path(query), path("neisseria.*") , emit: neisseria, optional: true
tuple val(meta), path(query), path("pseudomonas.*") , emit: pseudomonas, optional: true
tuple val(meta), path(query), path("salmonella.*") , emit: salmonella, optional: true
tuple val(meta), path(reads), path("salmonella.*") , emit: salmonella_fq, optional: true
tuple val(meta), path(query), path("staphylococcus.*"), emit: staphylococcus, optional: true
Expand All @@ -97,7 +98,7 @@ process MERLIN_DIST {
# Extract genus with hits
declare -a GENUS=(
"escherichia" "haemophilus" "glaesserella" "klebsiella" "legionella" "listeria" "mycobacterium" "neisseria" "salmonella" "shigella" "staphylococcus" "streptococcus"
"escherichia" "haemophilus" "glaesserella" "klebsiella" "legionella" "listeria" "mycobacterium" "neisseria" "pseudomonas" "salmonella" "shigella" "staphylococcus" "streptococcus"
)
for i in "\${GENUS[@]}"; do
if grep -q -i "\${i}" ${prefix}-dist.txt; then
Expand Down
6 changes: 3 additions & 3 deletions modules/nf-core/ngmaster/main.nf
Expand Up @@ -3,7 +3,7 @@ include { get_resources; initOptions; saveFiles } from '../../../lib/nf/function
RESOURCES = get_resources(workflow.profile, params.max_memory, params.max_cpus)
options = initOptions(params.options ? params.options : [:], 'ngmaster')
publish_dir = params.is_subworkflow ? "${params.outdir}/bactopia-tools/${params.wf}/${params.run_name}" : params.outdir
conda_tools = "bioconda::ngmaster=1.0.0"
conda_tools = "bioconda::ngmaster=0.5.8"
conda_name = conda_tools.replace("=", "-").replace(":", "-").replace(" ", "-")
conda_env = file("${params.condadir}/${conda_name}").exists() ? "${params.condadir}/${conda_name}" : conda_tools

Expand All @@ -15,8 +15,8 @@ process NGMASTER {

conda (params.enable_conda ? conda_env : null)
container "${ workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/ngmaster:1.0.0--pyhdfd78af_0' :
'quay.io/biocontainers/ngmaster:1.0.0--pyhdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/ngmaster:0.5.8--pyhdfd78af_1' :
'quay.io/biocontainers/ngmaster:0.5.8--pyhdfd78af_1' }"

input:
tuple val(meta), path(fasta)
Expand Down
53 changes: 53 additions & 0 deletions modules/nf-core/shigeifinder/main.nf
@@ -0,0 +1,53 @@
// Import generic module functions
include { get_resources; initOptions; saveFiles } from '../../../lib/nf/functions'
RESOURCES = get_resources(workflow.profile, params.max_memory, params.max_cpus)
options = initOptions(params.options ? params.options : [:], 'shigeifinder')
publish_dir = params.is_subworkflow ? "${params.outdir}/bactopia-tools/${params.wf}/${params.run_name}" : params.outdir
conda_tools = "bioconda::shigeifinder=1.3.2"
conda_name = conda_tools.replace("=", "-").replace(":", "-").replace(" ", "-")
conda_env = file("${params.condadir}/${conda_name}").exists() ? "${params.condadir}/${conda_name}" : conda_tools

process SHIGEIFINDER {
tag "$meta.id"
label 'process_low'
publishDir "${publish_dir}/${meta.id}", mode: params.publish_dir_mode, overwrite: params.force,
saveAs: { filename -> saveFiles(filename:filename, opts:options) }

conda (params.enable_conda ? conda_env : null)
container "${ workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/shigeifinder:1.3.2--pyhdfd78af_0':
'quay.io/biocontainers/shigeifinder:1.3.2--pyhdfd78af_0' }"

input:
tuple val(meta), path(fasta)

output:
tuple val(meta), path("*.tsv"), emit: tsv
path "*.{log,err}" , emit: logs, optional: true
path ".command.*" , emit: nf_logs
path "versions.yml" , emit: versions

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

script:
def prefix = options.suffix ? "${options.suffix}" : "${meta.id}"
def VERSION = '1.3.2' // WARN: Version information not provided by tool on CLI. Please update this string when bumping container versions.
def is_compressed = fasta.getName().endsWith(".gz") ? true : false
def fasta_name = fasta.getName().replace(".gz", "")
"""
if [ "$is_compressed" == "true" ]; then
gzip -c -d $fasta > $fasta_name
fi
shigeifinder \\
$options.args \\
--output ${prefix}.tsv \\
-t $task.cpus \\
-i $fasta_name
cat <<-END_VERSIONS > versions.yml
"${task.process}":
shigeifinder: $VERSION
END_VERSIONS
"""
}
44 changes: 44 additions & 0 deletions modules/nf-core/shigeifinder/meta.yml
@@ -0,0 +1,44 @@
name: "shigeifinder"
description: Determine Shigella serotype from assemblies or Illumina paired-end reads
keywords:
- fastq
- fasta
- shigella
- serotype
tools:
- "shigeifinder":
description: "Cluster informed Shigella and EIEC serotyping tool from Illumina reads and assemblies"
homepage: "https://mgtdb.unsw.edu.au/ShigEiFinder/"
documentation: "https://github.com/LanLab/ShigEiFinder"
tool_dev_url: "https://github.com/LanLab/ShigEiFinder"
doi: "10.1099/mgen.0.000704"
licence: "['GPL v3']"

input:
- meta:
type: map
description: |
Groovy Map containing sample information
e.g. [ id:'test', single_end:false ]
- seqs:
type: file
description: Assembly or paired-end Illumina reads
pattern: "*.{fasta.gz,fasta.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: A TSV formatted file with ShigEiFinder results
pattern: "*.tsv"

authors:
- "@rpetit3"
7 changes: 7 additions & 0 deletions modules/nf-core/shigeifinder/params.config
@@ -0,0 +1,7 @@
/*
This file includes default parameter values.
*/

params {
// ShigEiFinder has no opts for assemblies
}
23 changes: 23 additions & 0 deletions modules/nf-core/shigeifinder/params.json
@@ -0,0 +1,23 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"$id": "https://raw.githubusercontent.com/bactopia/bactopia/master/modules/nf-core/shigeifinder/params.json",
"title": "ShigEiFinder Module",
"description": "A module serotype prediction of Shigella and EIEC assemblies",
"type": "object",
"definitions": {
"shigeifinder_parameters": {
"title": "ShigEiFinder Parameters",
"type": "object",
"description": "",
"default": "",
"fa_icon": "fas fa-exclamation-circle",
"properties": {
}
}
},
"allOf": [
{
"$ref": "#/definitions/shigeifinder_parameters"
}
]
}
2 changes: 1 addition & 1 deletion modules/nf-core/tbprofiler/profile/main.nf
Expand Up @@ -49,7 +49,7 @@ process TBPROFILER_PROFILE {
cat <<-END_VERSIONS > versions.yml
"${task.process}":
tb-profiler: \$( echo \$(tb-profiler --version 2>&1) | sed 's/TBProfiler version //')
tb-profiler: \$( echo \$(tb-profiler version 2>&1) | sed 's/TBProfiler version //')
END_VERSIONS
"""
}
2 changes: 1 addition & 1 deletion subworkflows/local/agrvate/test.yml
Expand Up @@ -41,7 +41,7 @@
- path: bactopia-tools/agrvate/agrvate/logs/csvtk_concat/nf-csvtk_concat.trace
contains: ['nextflow.trace']
- path: bactopia-tools/agrvate/agrvate/logs/csvtk_concat/versions.yml
md5sum: 93eac8b8704de84acfa95e4d586e0554
md5sum: f01e89d3bda195694660e7331d5068ca
- path: bactopia-tools/agrvate/agrvate/nf-reports/agrvate-dag.dot
contains: ['agrvatedag', 'AGRVATE', 'versions']
- path: bactopia-tools/agrvate/agrvate/nf-reports/agrvate-report.html
Expand Down
8 changes: 4 additions & 4 deletions subworkflows/local/amrfinderplus/test.yml
Expand Up @@ -23,7 +23,7 @@
- path: bactopia-tools/amrfinderplus/amrfinderplus/GCF_000292685/logs/amrfinderplus/nf-amrfinderplus.trace
contains: ['nextflow.trace']
- path: bactopia-tools/amrfinderplus/amrfinderplus/GCF_000292685/logs/amrfinderplus/versions.yml
md5sum: fca875e602dd642306b46c74b88f4aa9
md5sum: b08785763f53feeae47fd3c453a6b80c
- path: bactopia-tools/amrfinderplus/amrfinderplus/amrfinderdb.tar.gz
- path: bactopia-tools/amrfinderplus/amrfinderplus/amrfinderplus-genes.tsv
md5sum: a5cc7b0baa9e11c9a31540800d0a740c
Expand All @@ -44,7 +44,7 @@
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/amrfinderplus/nf-amrfinderplus.trace
contains: ['nextflow.trace']
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/amrfinderplus/versions.yml
md5sum: 1405dadd470d6e34a74e188b8c014955
md5sum: 8d9634c5597904dc816d86c52248a9a4
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-genes/nf-csvtk_concat.begin
md5sum: d41d8cd98f00b204e9800998ecf8427e
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-genes/nf-csvtk_concat.err
Expand All @@ -58,7 +58,7 @@
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-genes/nf-csvtk_concat.trace
contains: ['nextflow.trace']
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-genes/versions.yml
md5sum: 5401f04fb435084a198f4183103f653d
md5sum: 47d72225a9337e33f7611a931a428f5b
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-proteins/nf-csvtk_concat.begin
md5sum: d41d8cd98f00b204e9800998ecf8427e
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-proteins/nf-csvtk_concat.err
Expand All @@ -72,7 +72,7 @@
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-proteins/nf-csvtk_concat.trace
contains: ['nextflow.trace']
- path: bactopia-tools/amrfinderplus/amrfinderplus/logs/csvtk_concat/amrfinderplus-proteins/versions.yml
md5sum: ba794f297811cbc5533d251ec6b5c44b
md5sum: 5b6f41b5ccc2800c3254241a399a08f5
- path: bactopia-tools/amrfinderplus/amrfinderplus/nf-reports/amrfinderplus-dag.dot
contains: ['amrfinderplus', 'AMRFINDER', 'versions']
- path: bactopia-tools/amrfinderplus/amrfinderplus/nf-reports/amrfinderplus-report.html
Expand Down
4 changes: 2 additions & 2 deletions subworkflows/local/ariba/test.yml
Expand Up @@ -46,7 +46,7 @@
- path: bactopia-tools/ariba/ariba/logs/csvtk_concat/ariba-report/nf-csvtk_concat.trace
contains: ['nextflow.trace']
- path: bactopia-tools/ariba/ariba/logs/csvtk_concat/ariba-report/versions.yml
md5sum: 87184f1a169523dd8743a8db771b240b
md5sum: ed544ea51225634aa8087ae1af3e0078
- path: bactopia-tools/ariba/ariba/logs/csvtk_concat/ariba-summary/nf-csvtk_concat.begin
- path: bactopia-tools/ariba/ariba/logs/csvtk_concat/ariba-summary/nf-csvtk_concat.err
- path: bactopia-tools/ariba/ariba/logs/csvtk_concat/ariba-summary/nf-csvtk_concat.log
Expand All @@ -58,7 +58,7 @@
- path: bactopia-tools/ariba/ariba/logs/csvtk_concat/ariba-summary/nf-csvtk_concat.trace
contains: ['nextflow.trace']
- path: bactopia-tools/ariba/ariba/logs/csvtk_concat/ariba-summary/versions.yml
md5sum: f2cbd40a3eabeb48921e20d4427bd9c1
md5sum: bc63e204d2b35a382bd98d9428d89568
- path: bactopia-tools/ariba/ariba/nf-reports/ariba-dag.dot
contains: ['aribadag', 'ARIBA', 'versions']
- path: bactopia-tools/ariba/ariba/nf-reports/ariba-report.html
Expand Down
16 changes: 8 additions & 8 deletions subworkflows/local/busco/test.yml
Expand Up @@ -69,7 +69,7 @@
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/busco_sequences/single_copy_busco_sequences/981870at2.fna
md5sum: 4bc28c4127d6d8749c1418ee9d18f95d
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/full_table.tsv
md5sum: 40b7586a93b8eccff32e76b02c964ecb
md5sum: f473ded1f1db2463533d51be6ed6fd2d
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/hmmer_output/.checkpoint
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/hmmer_output/1009041at2.out
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/hmmer_output/1024388at2.out
Expand All @@ -79,21 +79,21 @@
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/hmmer_output/981870at2.out
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/hmmer_output/984717at2.out
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/missing_busco_list.tsv
md5sum: 2bb012c0ba42e5055fe08fe5c5516ba5
md5sum: 8e6b6a4ba25caf8e7ad15e8a77064755
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/short_summary.json
contains: ["one_line_summary", "dataset_total_buscos", "dataset"]
contains: ["one_line_summary", "dataset"]
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/run_bacteria_odb10/short_summary.txt
contains: ["BUSCO", "Dependencies", "Total"]
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/short_summary.specific.bacteria_odb10.GCF_000292685.json
contains: ["one_line_summary", "dataset_total_buscos", "dataset"]
contains: ["one_line_summary", "dataset"]
- path: bactopia-tools/busco/busco/bacteria_odb10/GCF_000292685/short_summary.specific.bacteria_odb10.GCF_000292685.txt
contains: ["BUSCO", "Dependencies", "Total"]
- path: bactopia-tools/busco/busco/bacteria_odb10/bacteria_odb10-summary.txt
md5sum: 17ce5249d44c09f0f662fdf3f5550b2b
md5sum: 751340944f3edeed5a5d17dfff29aaf4
- path: bactopia-tools/busco/busco/bacteria_odb10/logs/busco.log
contains: ["run_BUSCO", "hmmsearch", "done"]
- path: bactopia-tools/busco/busco/busco.tsv
md5sum: 17ce5249d44c09f0f662fdf3f5550b2b
md5sum: 751340944f3edeed5a5d17dfff29aaf4
- path: bactopia-tools/busco/busco/logs/busco/bacteria_odb10/nf-busco.begin
- path: bactopia-tools/busco/busco/logs/busco/bacteria_odb10/nf-busco.err
- path: bactopia-tools/busco/busco/logs/busco/bacteria_odb10/nf-busco.log
Expand All @@ -107,7 +107,7 @@
- path: bactopia-tools/busco/busco/logs/busco/bacteria_odb10/nf-busco.trace
contains: ['nextflow.trace']
- path: bactopia-tools/busco/busco/logs/busco/bacteria_odb10/versions.yml
md5sum: 552d699fa079457058d3a09ec85e679f
md5sum: 4f49e05bf84e76195e8c7627d13f6d6d
- path: bactopia-tools/busco/busco/logs/csvtk_concat/nf-csvtk_concat.begin
- path: bactopia-tools/busco/busco/logs/csvtk_concat/nf-csvtk_concat.err
- path: bactopia-tools/busco/busco/logs/csvtk_concat/nf-csvtk_concat.log
Expand All @@ -120,7 +120,7 @@
- path: bactopia-tools/busco/busco/logs/csvtk_concat/nf-csvtk_concat.trace
contains: ['nextflow.trace']
- path: bactopia-tools/busco/busco/logs/csvtk_concat/versions.yml
md5sum: 4bf5ea200e8f4c6fa2b99a9fe3b6a2aa
md5sum: 5e9df2e146ce9731dd1fb0020bb666b2
- path: bactopia-tools/busco/busco/nf-reports/busco-dag.dot
contains: ['buscodag', 'BUSCO', 'versions']
- path: bactopia-tools/busco/busco/nf-reports/busco-report.html
Expand Down
1 change: 1 addition & 0 deletions subworkflows/local/mashdist/main.nf
Expand Up @@ -75,6 +75,7 @@ workflow MERLINDIST {
mycobacterium = MERLINDIST_MODULE.out.mycobacterium
mycobacterium_fq = MERLINDIST_MODULE.out.mycobacterium_fq
neisseria = MERLINDIST_MODULE.out.neisseria
pseudomonas = MERLINDIST_MODULE.out.pseudomonas
salmonella = MERLINDIST_MODULE.out.salmonella
salmonella_fq = MERLINDIST_MODULE.out.salmonella_fq
staphylococcus = MERLINDIST_MODULE.out.staphylococcus
Expand Down
15 changes: 14 additions & 1 deletion subworkflows/local/merlin/main.nf
Expand Up @@ -13,9 +13,12 @@ include { LEGSTA } from '../legsta/main';
include { LISSERO } from '../lissero/main';
include { MENINGOTYPE } from '../meningotype/main';
include { NGMASTER } from '../ngmaster/main';
include { PASTY } from '../pasty/main';
include { PBPTYPER } from '../pbptyper/main';
include { SEQSERO2 } from '../seqsero2/main';
include { SEROBA } from '../seroba/main';
include { SHIGATYPER } from '../shigatyper/main';
include { SHIGEIFINDER } from '../shigeifinder/main';
include { SISTR } from '../sistr/main';
include { SSUISSERO } from '../ssuissero/main';
include { STAPHTYPER } from '../staphtyper/main';
Expand All @@ -35,8 +38,11 @@ workflow MERLIN {
MERLINDIST.out.escherichia.map{meta, assembly, found -> [meta, assembly]}.set{ ch_escherichia }
MERLINDIST.out.escherichia_fq.map{meta, reads, found -> [meta, reads]}.set{ ch_escherichia_fq }
ECTYPER(ch_escherichia)
SHIGATYPER(ch_escherichia_fq)
ch_versions = ch_versions.mix(ECTYPER.out.versions.first())
SHIGATYPER(ch_escherichia_fq)
ch_versions = ch_versions.mix(SHIGATYPER.out.versions.first())
SHIGEIFINDER(ch_escherichia)
ch_versions = ch_versions.mix(SHIGEIFINDER.out.versions.first())

// Haemophilus
MERLINDIST.out.haemophilus.map{meta, assembly, found -> [meta, assembly]}.set{ ch_haemophilus }
Expand Down Expand Up @@ -72,6 +78,11 @@ workflow MERLIN {
NGMASTER(ch_neisseria)
ch_versions = ch_versions.mix(NGMASTER.out.versions.first())

// Pseudomonas
MERLINDIST.out.pseudomonas.map{meta, assembly, found -> [meta, assembly]}.set{ ch_pseudomonas }
PASTY(ch_pseudomonas)
ch_versions = ch_versions.mix(PASTY.out.versions.first())

// Salmonella
MERLINDIST.out.salmonella.map{meta, assembly, found -> [meta, assembly]}.set{ ch_salmonella }
MERLINDIST.out.salmonella_fq.map{meta, reads, found -> [meta, reads]}.set{ ch_salmonella_fq }
Expand All @@ -92,6 +103,8 @@ workflow MERLIN {
MERLINDIST.out.streptococcus_fq.map{meta, reads, found -> [meta, reads]}.set{ ch_streptococcus_fq }
EMMTYPER(ch_streptococcus)
ch_versions = ch_versions.mix(EMMTYPER.out.versions.first())
PBPTYPER(ch_streptococcus)
ch_versions = ch_versions.mix(PBPTYPER.out.versions.first())
SEROBA(ch_streptococcus_fq)
ch_versions = ch_versions.mix(SEROBA.out.versions.first())
SSUISSERO(ch_streptococcus)
Expand Down

0 comments on commit a8f7ea4

Please sign in to comment.