removed param eggnog_dbpath from subworkflow

nf-core · Feb 13, 2024 · 494648b · 494648b
1 parent b045877
commit 494648b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/modules/local/eggnog/mapper.nf b/modules/local/eggnog/mapper.nf
@@ -9,8 +9,7 @@ process EGGNOG_MAPPER {
 
     input:
     tuple val(meta), path(fasta)
-    path(db)
-    path(eggnog_db) // Marker purpose only; to make execution wait for the download process to finish
+    path(eggnog_db), stageAs: 'eggnog/*'
 
     output:
     tuple val(meta), path("*.emapper.hits.gz")                , emit: hits
@@ -37,7 +36,7 @@ process EGGNOG_MAPPER {
     emapper.py \\
         $args \\
         --cpu $task.cpus \\
-        --data_dir $db \\
+        --data_dir eggnog \\
         --output $prefix \\
         -i $input
 

diff --git a/subworkflows/local/eggnog.nf b/subworkflows/local/eggnog.nf
@@ -10,17 +10,14 @@ workflow EGGNOG {
     take:
     faa
     collect_fcs
-    dbpath
 
     main:
     ch_versions = Channel.empty()
 
-    ch_dbpath = Channel.fromPath(dbpath, checkIfExists: true)
-
     EGGNOG_DOWNLOAD()
     ch_versions = ch_versions.mix ( EGGNOG_DOWNLOAD.out.versions )
 
-    EGGNOG_MAPPER ( faa, ch_dbpath, EGGNOG_DOWNLOAD.out.eggnog_db )
+    EGGNOG_MAPPER ( faa, EGGNOG_DOWNLOAD.out.all )
     ch_versions = ch_versions.mix ( EGGNOG_MAPPER.out.versions )
 
     EGGNOG_SUM ( EGGNOG_MAPPER.out.emappertsv, collect_fcs )

diff --git a/workflows/metatdenovo.nf b/workflows/metatdenovo.nf
@@ -421,7 +421,7 @@ workflow METATDENOVO {
     // SUBWORKFLOW: run eggnog_mapper on the ORF-called amino acid sequences
     //
     if ( ! params.skip_eggnog ) {
-        EGGNOG(ch_protein, ch_fcs_for_summary, params.eggnog_dbpath)
+        EGGNOG(ch_protein, ch_fcs_for_summary)
         ch_versions = ch_versions.mix(EGGNOG.out.versions)
         ch_merge_tables = EGGNOG.out.sumtable
     } else {