Skip to content

Commit

Permalink
Merge pull request #719 from d4straub/export-all-versions
Browse files Browse the repository at this point in the history
Export all process software versions
  • Loading branch information
d4straub authored Mar 26, 2024
2 parents 0926dc2 + 0297f1a commit 0c24ff3
Show file tree
Hide file tree
Showing 20 changed files with 125 additions and 50 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### `Changed`

- [#719](https://github.com/nf-core/ampliseq/pull/719) - Versions of all (instead of selected) processes are now exported to `pipeline_info/software_versions.yml`

### `Fixed`

- [#697](https://github.com/nf-core/ampliseq/pull/697),[#699](https://github.com/nf-core/ampliseq/pull/699),[#713](https://github.com/nf-core/ampliseq/pull/713) - Template update for nf-core/tools version 2.13.1
Expand Down
3 changes: 2 additions & 1 deletion modules/local/barrnapsummary.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ process BARRNAPSUMMARY {

output:
path "summary.tsv" , emit: summary
path "*warning.txt" , emit: warning
path "*warning.txt", emit: warning
path "versions.yml", emit: versions

when:
task.ext.when == null || task.ext.when
Expand Down
10 changes: 5 additions & 5 deletions modules/local/format_taxonomy.nf
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ process FORMAT_TAXONOMY {

script:
"""
${params.dada_ref_databases[params.dada_ref_taxonomy]["fmtscript"]}
${params.dada_ref_databases[params.dada_ref_taxonomy]["fmtscript"]} \\
#Giving out information
echo -e "--dada_ref_taxonomy: ${params.dada_ref_taxonomy}\n" >ref_taxonomy.${suffix}.txt
echo -e "Title: ${params.dada_ref_databases[params.dada_ref_taxonomy]["title"]}\n" >>ref_taxonomy.${suffix}.txt
echo -e "Citation: ${params.dada_ref_databases[params.dada_ref_taxonomy]["citation"]}\n" >>ref_taxonomy.${suffix}.txt
echo -e "--dada_ref_taxonomy: ${params.dada_ref_taxonomy}\\n" >ref_taxonomy.${suffix}.txt
echo -e "Title: ${params.dada_ref_databases[params.dada_ref_taxonomy]["title"]}\\n" >>ref_taxonomy.${suffix}.txt
echo -e "Citation: ${params.dada_ref_databases[params.dada_ref_taxonomy]["citation"]}\\n" >>ref_taxonomy.${suffix}.txt
echo "All entries: ${params.dada_ref_databases[params.dada_ref_taxonomy]}" >>ref_taxonomy.${suffix}.txt
cat <<-END_VERSIONS > versions.yml
"${task.process}":
bash: \$(bash --version | sed -n 1p | sed 's/GNU bash, version //g')
bash: \$(bash --version | sed -n 1p | grep -Eo 'version [[:alnum:].]+' | sed 's/version //')
END_VERSIONS
"""
}
10 changes: 5 additions & 5 deletions modules/local/format_taxonomy_qiime.nf
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ process FORMAT_TAXONOMY_QIIME {

script:
"""
${params.qiime_ref_databases[params.qiime_ref_taxonomy]["fmtscript"]}
${params.qiime_ref_databases[params.qiime_ref_taxonomy]["fmtscript"]} \\
#Giving out information
echo -e "--qiime_ref_taxonomy: ${params.qiime_ref_taxonomy}\n" >ref_taxonomy.txt
echo -e "Title: ${params.qiime_ref_databases[params.qiime_ref_taxonomy]["title"]}\n" >>ref_taxonomy.txt
echo -e "Citation: ${params.qiime_ref_databases[params.qiime_ref_taxonomy]["citation"]}\n" >>ref_taxonomy.txt
echo -e "--qiime_ref_taxonomy: ${params.qiime_ref_taxonomy}\\n" >ref_taxonomy.txt
echo -e "Title: ${params.qiime_ref_databases[params.qiime_ref_taxonomy]["title"]}\\n" >>ref_taxonomy.txt
echo -e "Citation: ${params.qiime_ref_databases[params.qiime_ref_taxonomy]["citation"]}\\n" >>ref_taxonomy.txt
echo "All entries: ${params.qiime_ref_databases[params.qiime_ref_taxonomy]}" >>ref_taxonomy.txt
cat <<-END_VERSIONS > versions.yml
"${task.process}":
bash: \$(bash --version | sed -n 1p | sed 's/GNU bash, version //g')
bash: \$(bash --version | sed -n 1p | grep -Eo 'version [[:alnum:].]+' | sed 's/version //')
END_VERSIONS
"""
}
10 changes: 5 additions & 5 deletions modules/local/format_taxonomy_sidle.nf
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ process FORMAT_TAXONOMY_SIDLE {
script:
def derep = params.sidle_ref_databases[params.sidle_ref_taxonomy]["derep"] ?: "99"
"""
${params.sidle_ref_databases[params.sidle_ref_taxonomy]["fmtscript"]} ${derep}
${params.sidle_ref_databases[params.sidle_ref_taxonomy]["fmtscript"]} ${derep} \\
#Giving out information
echo -e "--sidle_ref_taxonomy: ${params.sidle_ref_taxonomy}\n" >ref_taxonomy.${suffix}.txt
echo -e "Title: ${params.sidle_ref_databases[params.sidle_ref_taxonomy]["title"]}\n" >>ref_taxonomy.${suffix}.txt
echo -e "Citation: ${params.sidle_ref_databases[params.sidle_ref_taxonomy]["citation"]}\n" >>ref_taxonomy.${suffix}.txt
echo -e "--sidle_ref_taxonomy: ${params.sidle_ref_taxonomy}\\n" >ref_taxonomy.${suffix}.txt
echo -e "Title: ${params.sidle_ref_databases[params.sidle_ref_taxonomy]["title"]}\\n" >>ref_taxonomy.${suffix}.txt
echo -e "Citation: ${params.sidle_ref_databases[params.sidle_ref_taxonomy]["citation"]}\\n" >>ref_taxonomy.${suffix}.txt
echo "All entries: ${params.sidle_ref_databases[params.sidle_ref_taxonomy]}" >>ref_taxonomy.${suffix}.txt
cat <<-END_VERSIONS > versions.yml
"${task.process}":
bash: \$(bash --version | sed -n 1p | sed 's/GNU bash, version //g')
bash: \$(bash --version | sed -n 1p | grep -Eo 'version [[:alnum:].]+' | sed 's/version //')
END_VERSIONS
"""
}
10 changes: 5 additions & 5 deletions modules/local/format_taxonomy_sintax.nf
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ process FORMAT_TAXONOMY_SINTAX {

script:
"""
${params.sintax_ref_databases[params.sintax_ref_taxonomy]["fmtscript"]}
${params.sintax_ref_databases[params.sintax_ref_taxonomy]["fmtscript"]} \\
#Giving out information
echo -e "--sintax_ref_taxonomy: ${params.sintax_ref_taxonomy}\n" >ref_taxonomy_sintax.txt
echo -e "Title: ${params.sintax_ref_databases[params.sintax_ref_taxonomy]["title"]}\n" >>ref_taxonomy_sintax.txt
echo -e "Citation: ${params.sintax_ref_databases[params.sintax_ref_taxonomy]["citation"]}\n" >>ref_taxonomy_sintax.txt
echo -e "--sintax_ref_taxonomy: ${params.sintax_ref_taxonomy}\\n" >ref_taxonomy_sintax.txt
echo -e "Title: ${params.sintax_ref_databases[params.sintax_ref_taxonomy]["title"]}\\n" >>ref_taxonomy_sintax.txt
echo -e "Citation: ${params.sintax_ref_databases[params.sintax_ref_taxonomy]["citation"]}\\n" >>ref_taxonomy_sintax.txt
echo "All entries: ${params.sintax_ref_databases[params.sintax_ref_taxonomy]}" >>ref_taxonomy_sintax.txt
cat <<-END_VERSIONS > versions.yml
"${task.process}":
bash: \$(bash --version | sed -n 1p | sed 's/GNU bash, version //g')
bash: \$(bash --version | sed -n 1p | grep -Eo 'version [[:alnum:].]+' | sed 's/version //')
END_VERSIONS
"""
}
2 changes: 1 addition & 1 deletion modules/local/phyloseq_inasv.nf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ process PHYLOSEQ_INASV {
cat <<-END_VERSIONS > versions.yml
"${task.process}":
bash: \$(bash --version | sed -n 1p | sed 's/GNU bash, version //g')
bash: \$(bash --version | sed -n 1p | grep -Eo 'version [[:alnum:].]+' | sed 's/version //')
END_VERSIONS
"""
}
15 changes: 11 additions & 4 deletions subworkflows/local/cutadapt_workflow.nf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ workflow CUTADAPT_WORKFLOW {
ch_file
illumina_pe_its
double_primer

main:
ch_versions_cutadapt_workflow = Channel.empty()

CUTADAPT_BASIC ( ch_file ).reads.set { ch_trimmed_reads }
CUTADAPT_BASIC.out.log
.map {
Expand All @@ -24,7 +27,9 @@ workflow CUTADAPT_WORKFLOW {
[ meta, log ] }
.groupTuple(by: 0 )
.set { ch_cutadapt_logs }
ch_versions_cutadapt_workflow = ch_versions_cutadapt_workflow.mix( CUTADAPT_BASIC.out.versions )
CUTADAPT_SUMMARY_STD ( "cutadapt_standard", ch_cutadapt_logs )
ch_versions_cutadapt_workflow = ch_versions_cutadapt_workflow.mix( CUTADAPT_SUMMARY_STD.out.versions )

if (illumina_pe_its) {
CUTADAPT_READTHROUGH ( ch_trimmed_reads ).reads.set { ch_trimmed_reads }
Expand All @@ -42,7 +47,9 @@ workflow CUTADAPT_WORKFLOW {
.set { ch_cutadapt_doubleprimer_logs }
CUTADAPT_SUMMARY_DOUBLEPRIMER ( "cutadapt_doubleprimer", ch_cutadapt_doubleprimer_logs )
ch_summaries = CUTADAPT_SUMMARY_STD.out.tsv.combine( CUTADAPT_SUMMARY_DOUBLEPRIMER.out.tsv )
ch_versions_cutadapt_workflow = ch_versions_cutadapt_workflow.mix( CUTADAPT_SUMMARY_DOUBLEPRIMER.out.versions )
CUTADAPT_SUMMARY_MERGE ( "merge", ch_summaries )
ch_versions_cutadapt_workflow = ch_versions_cutadapt_workflow.mix( CUTADAPT_SUMMARY_MERGE.out.versions )
} else {
CUTADAPT_SUMMARY_MERGE ( "copy", CUTADAPT_SUMMARY_STD.out.tsv )
}
Expand All @@ -68,8 +75,8 @@ workflow CUTADAPT_WORKFLOW {
}

emit:
reads = ch_trimmed_reads_passed
logs = CUTADAPT_BASIC.out.log
summary = CUTADAPT_SUMMARY_MERGE.out.tsv
versions= CUTADAPT_BASIC.out.versions
reads = ch_trimmed_reads_passed
logs = CUTADAPT_BASIC.out.log
summary = CUTADAPT_SUMMARY_MERGE.out.tsv
versions = ch_versions_cutadapt_workflow
}
1 change: 1 addition & 0 deletions subworkflows/local/dada2_preprocessing.nf
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ workflow DADA2_PREPROCESSING {
ch_DADA2_QUALITY2_SVG = Channel.empty()
if ( !params.skip_dada_quality ) {
DADA2_QUALITY2 ( ch_all_preprocessed_reads.dump(tag: 'into_dada2_quality2') )
ch_versions_dada2_preprocessing = ch_versions_dada2_preprocessing.mix(DADA2_QUALITY2.out.versions)
DADA2_QUALITY2.out.warning.subscribe { if ( it.baseName.toString().startsWith("WARNING") ) log.warn it.baseName.toString().replace("WARNING ","DADA2_QUALITY2: ") }
ch_DADA2_QUALITY2_SVG = DADA2_QUALITY2.out.svg
}
Expand Down
1 change: 1 addition & 0 deletions subworkflows/local/dada2_taxonomy_wf.nf
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ workflow DADA2_TAXONOMY_WF {
CUTADAPT_TAXONOMY ( ch_assigntax ).reads
.map { meta, db -> db }
.set { ch_assigntax }
ch_versions_dada_taxonomy = ch_versions_dada_taxonomy.mix( CUTADAPT_TAXONOMY.out.versions )
}

//set file name prefix
Expand Down
1 change: 1 addition & 0 deletions subworkflows/local/kraken2_taxonomy_wf.nf
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ workflow KRAKEN2_TAXONOMY_WF {
def meta = [:]
meta.id = val_kraken2_ref_taxonomy
[ meta, db ] } )
ch_versions_kraken2_taxonomy = ch_versions_kraken2_taxonomy.mix(UNTAR.out.versions)
ch_kraken2db = UNTAR.out.untar.map{ it[1] }
ch_kraken2db = ch_kraken2db.mix(ch_kraken2_ref_taxonomy.dir)

Expand Down
4 changes: 2 additions & 2 deletions subworkflows/local/phyloseq_workflow.nf
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ workflow PHYLOSEQ_WORKFLOW {
PHYLOSEQ ( ch_tax.combine(ch_phyloseq_inasv), ch_phyloseq_inmeta, ch_phyloseq_intree )

emit:
rds = PHYLOSEQ.out.rds
versions= PHYLOSEQ.out.versions
rds = PHYLOSEQ.out.rds
versions = PHYLOSEQ.out.versions
}
8 changes: 7 additions & 1 deletion subworkflows/local/qiime2_ancom.nf
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ workflow QIIME2_ANCOM {
tax_agglom_max

main:
ch_versions_qiime2_ancom = Channel.empty()

//Filter ASV table to get rid of samples that have no metadata values
ch_metadata
.combine( ch_asv )
.combine( ch_metacolumn_all )
.set{ ch_for_filtersamples }
QIIME2_FILTERSAMPLES_ANCOM ( ch_for_filtersamples )
ch_versions_qiime2_ancom = ch_versions_qiime2_ancom.mix(QIIME2_FILTERSAMPLES_ANCOM.out.versions)

//ANCOM on various taxonomic levels
ch_taxlevel = Channel.of( tax_agglom_min..tax_agglom_max )
Expand All @@ -31,10 +34,13 @@ workflow QIIME2_ANCOM {
.combine( ch_taxlevel )
.set{ ch_for_ancom_tax }
QIIME2_ANCOM_TAX ( ch_for_ancom_tax )
ch_versions_qiime2_ancom = ch_versions_qiime2_ancom.mix(QIIME2_ANCOM_TAX.out.versions)
QIIME2_ANCOM_TAX.out.ancom.subscribe { if ( it.baseName[0].toString().startsWith("WARNING") ) log.warn it.baseName[0].toString().replace("WARNING ","QIIME2_ANCOM_TAX: ") }

QIIME2_ANCOM_ASV ( ch_metadata.combine( QIIME2_FILTERSAMPLES_ANCOM.out.qza.flatten() ) )
ch_versions_qiime2_ancom = ch_versions_qiime2_ancom.mix(QIIME2_ANCOM_ASV.out.versions)

emit:
ancom = QIIME2_ANCOM_ASV.out.ancom.mix(QIIME2_ANCOM_TAX.out.ancom)
ancom = QIIME2_ANCOM_ASV.out.ancom.mix(QIIME2_ANCOM_TAX.out.ancom)
versions = ch_versions_qiime2_ancom
}
6 changes: 6 additions & 0 deletions subworkflows/local/qiime2_barplotavg.nf
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,25 @@ workflow QIIME2_BARPLOTAVG {
metadata_category_barplot

main:
ch_versions_qiime2_barplotavg = Channel.empty()
ch_metadata_category_barplot = Channel.fromList(metadata_category_barplot.tokenize(','))

//Import raltive ASV table
QIIME2_INASV_BPAVG ( ch_rel_tsv )
ch_versions_qiime2_barplotavg = ch_versions_qiime2_barplotavg.mix(QIIME2_INASV_BPAVG.out.versions)

//group by metadata category (ch_metadata_category_barplot)
QIIME2_FEATURETABLE_GROUP (
QIIME2_INASV_BPAVG.out.qza
.combine(ch_metadata)
.combine(ch_metadata_category_barplot)
)
ch_versions_qiime2_barplotavg = ch_versions_qiime2_barplotavg.mix(QIIME2_FEATURETABLE_GROUP.out.versions)

//Barplot
QIIME2_BPAVG ( [], QIIME2_FEATURETABLE_GROUP.out.qza, ch_tax, 'average' )
ch_versions_qiime2_barplotavg = ch_versions_qiime2_barplotavg.mix(QIIME2_BPAVG.out.versions)

emit:
versions = ch_versions_qiime2_barplotavg
}
20 changes: 15 additions & 5 deletions subworkflows/local/qiime2_diversity.nf
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,26 @@ workflow QIIME2_DIVERSITY {
diversity_rarefaction_depth

main:
ch_versions_qiime2_diversity = Channel.empty()

//Phylogenetic tree for beta & alpha diversities
if (!ch_tree) {
QIIME2_TREE ( ch_seq )
ch_versions_qiime2_diversity = ch_versions_qiime2_diversity.mix(QIIME2_TREE.out.versions)
ch_tree = QIIME2_TREE.out.qza
}

//Alpha-rarefaction
if (!skip_alpha_rarefaction) {
QIIME2_ALPHARAREFACTION ( ch_metadata, ch_asv, ch_tree, ch_stats )
ch_versions_qiime2_diversity = ch_versions_qiime2_diversity.mix(QIIME2_ALPHARAREFACTION.out.versions)
}

//Calculate diversity indices
if (!skip_diversity_indices) {

QIIME2_DIVERSITY_CORE ( ch_metadata, ch_asv, ch_tree, ch_stats, diversity_rarefaction_depth )
ch_versions_qiime2_diversity = ch_versions_qiime2_diversity.mix(QIIME2_DIVERSITY_CORE.out.versions)
//Print warning if rarefaction depth is <10000
QIIME2_DIVERSITY_CORE.out.depth.subscribe { if ( it.baseName.toString().startsWith("WARNING") ) log.warn it.baseName.toString().replace("WARNING ","QIIME2_DIVERSITY_CORE: ") }

Expand All @@ -47,13 +52,15 @@ workflow QIIME2_DIVERSITY {
.combine( QIIME2_DIVERSITY_CORE.out.vector.flatten() )
.set{ ch_to_diversity_alpha }
QIIME2_DIVERSITY_ALPHA ( ch_to_diversity_alpha )
ch_versions_qiime2_diversity = ch_versions_qiime2_diversity.mix(QIIME2_DIVERSITY_ALPHA.out.versions)

//beta_diversity ( ch_metadata, DIVERSITY_CORE.out.qza, ch_metacolumn_pairwise )
ch_metadata
.combine( QIIME2_DIVERSITY_CORE.out.distance.flatten() )
.combine( ch_metacolumn_pairwise )
.set{ ch_to_diversity_beta }
QIIME2_DIVERSITY_BETA ( ch_to_diversity_beta )
ch_versions_qiime2_diversity = ch_versions_qiime2_diversity.mix(QIIME2_DIVERSITY_BETA.out.versions)

//adonis ( ch_metadata, DIVERSITY_CORE.out.qza )
if (params.qiime_adonis_formula) {
Expand All @@ -63,19 +70,22 @@ workflow QIIME2_DIVERSITY {
.combine( ch_qiime_adonis_formula )
.set{ ch_to_diversity_beta }
QIIME2_DIVERSITY_ADONIS ( ch_to_diversity_beta )
ch_versions_qiime2_diversity = ch_versions_qiime2_diversity.mix(QIIME2_DIVERSITY_ADONIS.out.versions)
}

//beta_diversity_ordination ( ch_metadata, DIVERSITY_CORE.out.qza )
ch_metadata
.combine( QIIME2_DIVERSITY_CORE.out.pcoa.flatten() )
.set{ ch_to_diversity_betaord }
QIIME2_DIVERSITY_BETAORD ( ch_to_diversity_betaord )
ch_versions_qiime2_diversity = ch_versions_qiime2_diversity.mix(QIIME2_DIVERSITY_BETAORD.out.versions)
}

emit:
depth = !skip_diversity_indices ? QIIME2_DIVERSITY_CORE.out.depth : []
alpha = !skip_diversity_indices ? QIIME2_DIVERSITY_ALPHA.out.alpha : []
beta = !skip_diversity_indices ? QIIME2_DIVERSITY_BETA.out.beta : []
betaord = !skip_diversity_indices ? QIIME2_DIVERSITY_BETAORD.out.beta : []
adonis = !skip_diversity_indices && params.qiime_adonis_formula ? QIIME2_DIVERSITY_ADONIS.out.html : []
depth = !skip_diversity_indices ? QIIME2_DIVERSITY_CORE.out.depth : []
alpha = !skip_diversity_indices ? QIIME2_DIVERSITY_ALPHA.out.alpha : []
beta = !skip_diversity_indices ? QIIME2_DIVERSITY_BETA.out.beta : []
betaord = !skip_diversity_indices ? QIIME2_DIVERSITY_BETAORD.out.beta : []
adonis = !skip_diversity_indices && params.qiime_adonis_formula ? QIIME2_DIVERSITY_ADONIS.out.html : []
versions = ch_versions_qiime2_diversity
}
16 changes: 13 additions & 3 deletions subworkflows/local/qiime2_export.nf
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,39 @@ workflow QIIME2_EXPORT {
tax_agglom_max

main:
ch_versions_qiime2_export = Channel.empty()

//export_filtered_dada_output (optional)
QIIME2_EXPORT_ABSOLUTE ( ch_asv, ch_seq, ch_tax, tax_agglom_min, tax_agglom_max )
ch_versions_qiime2_export = ch_versions_qiime2_export.mix(QIIME2_EXPORT_ABSOLUTE.out.versions)

//RelativeAbundanceASV (optional)
QIIME2_EXPORT_RELASV ( ch_asv )
ch_versions_qiime2_export = ch_versions_qiime2_export.mix(QIIME2_EXPORT_RELASV.out.versions)

//RelativeAbundanceReducedTaxa (optional)
QIIME2_EXPORT_RELTAX ( ch_asv, ch_tax, tax_agglom_min, tax_agglom_max )
ch_versions_qiime2_export = ch_versions_qiime2_export.mix(QIIME2_EXPORT_RELTAX.out.versions)

//combine_table.r (optional), similar to DADA2_table.tsv but with additionally taxonomy merged
COMBINE_TABLE_QIIME2 ( QIIME2_EXPORT_RELASV.out.tsv, QIIME2_EXPORT_ABSOLUTE.out.fasta, ch_QIIME2_tax_tsv, 'rel-table-ASV_with-QIIME2-tax.tsv' )
ch_versions_qiime2_export = ch_versions_qiime2_export.mix(COMBINE_TABLE_QIIME2.out.versions)

//combine_table.r (optional), similar to DADA2_table.tsv but with additionally taxonomy merged
COMBINE_TABLE_DADA2 ( QIIME2_EXPORT_RELASV.out.tsv, QIIME2_EXPORT_ABSOLUTE.out.fasta, ch_DADA2_tax_tsv, 'rel-table-ASV_with-DADA2-tax.tsv' )
ch_versions_qiime2_export = ch_versions_qiime2_export.mix(COMBINE_TABLE_DADA2.out.versions)

//combine_table.r (optional), similar to DADA2_table.tsv but with additionally taxonomy merged
COMBINE_TABLE_PPLACE ( QIIME2_EXPORT_RELASV.out.tsv, QIIME2_EXPORT_ABSOLUTE.out.fasta, ch_pplace_tax_tsv, 'rel-table-ASV_with-PPLACE-tax.tsv' )
ch_versions_qiime2_export = ch_versions_qiime2_export.mix(COMBINE_TABLE_PPLACE.out.versions)

//combine_table.r (optional), similar to DADA2_table.tsv but with additionally taxonomy merged
COMBINE_TABLE_SINTAX ( QIIME2_EXPORT_RELASV.out.tsv, QIIME2_EXPORT_ABSOLUTE.out.fasta, ch_SINTAX_tax_tsv, 'rel-table-ASV_with-SINTAX-tax.tsv' )
ch_versions_qiime2_export = ch_versions_qiime2_export.mix(COMBINE_TABLE_SINTAX.out.versions)

emit:
abs_fasta = QIIME2_EXPORT_ABSOLUTE.out.fasta
abs_tsv = QIIME2_EXPORT_ABSOLUTE.out.tsv
rel_tsv = QIIME2_EXPORT_RELASV.out.tsv
abs_fasta = QIIME2_EXPORT_ABSOLUTE.out.fasta
abs_tsv = QIIME2_EXPORT_ABSOLUTE.out.tsv
rel_tsv = QIIME2_EXPORT_RELASV.out.tsv
versions = ch_versions_qiime2_export
}
6 changes: 3 additions & 3 deletions subworkflows/local/qiime2_taxonomy.nf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workflow QIIME2_TAXONOMY {
QIIME2_CLASSIFY ( ch_classifier, QIIME2_INSEQ.out.qza )

emit:
qza = QIIME2_CLASSIFY.out.qza
tsv = QIIME2_CLASSIFY.out.tsv
versions= QIIME2_INSEQ.out.versions
qza = QIIME2_CLASSIFY.out.qza
tsv = QIIME2_CLASSIFY.out.tsv
versions = QIIME2_INSEQ.out.versions.mix(QIIME2_CLASSIFY.out.versions)
}
1 change: 1 addition & 0 deletions subworkflows/local/sidle_wf.nf
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ workflow SIDLE_WF {
if (!params.sidle_ref_tax_custom) {
//standard ref taxonomy input from conf/ref_databases.config, one tar.gz / tgz with all files
FORMAT_TAXONOMY_SIDLE ( ch_sidle_ref_taxonomy, val_sidle_ref_taxonomy )
ch_sidle_versions = ch_sidle_versions.mix(FORMAT_TAXONOMY_SIDLE.out.versions)
ch_db_sequences = FORMAT_TAXONOMY_SIDLE.out.seq
ch_db_alignedsequences = FORMAT_TAXONOMY_SIDLE.out.alnseq
ch_db_taxonomy = FORMAT_TAXONOMY_SIDLE.out.tax
Expand Down
Loading

0 comments on commit 0c24ff3

Please sign in to comment.