Refactor ext args as params

Signed-off-by: Ben Sherman <[email protected]>
nf-core · Apr 24, 2024 · 774cf7c · 774cf7c
1 parent d9d54b8
commit 774cf7c
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git a/modules/local/aspera_cli/main.nf b/modules/local/aspera_cli/main.nf
@@ -10,14 +10,14 @@ process ASPERA_CLI {
     input:
     tuple val(meta), val(fastq)
     val user
+    var args
 
     output:
     tuple val(meta), path("*fastq.gz"), emit: fastq
     tuple val(meta), path("*md5")     , emit: md5
     path "versions.yml"               , emit: versions
 
     script:
-    def args = task.ext.args ?: ''
     def conda_prefix = ['singularity', 'apptainer'].contains(workflow.containerEngine) ? "export CONDA_PREFIX=/usr/local" : ""
     if (meta.single_end) {
         """

diff --git a/modules/local/aspera_cli/nextflow.config b/modules/local/aspera_cli/nextflow.config
@@ -1,6 +1,5 @@
 process {
     withName: 'ASPERA_CLI' {
-        ext.args = '-QT -l 300m -P33001'
         publishDir = [
             [
                 path: { "${params.outdir}/fastq" },

diff --git a/modules/local/sra_fastq_ftp/main.nf b/modules/local/sra_fastq_ftp/main.nf
@@ -11,14 +11,14 @@ process SRA_FASTQ_FTP {
 
     input:
     tuple val(meta), val(fastq)
+    val args
 
     output:
     tuple val(meta), path("*fastq.gz"), emit: fastq
     tuple val(meta), path("*md5")     , emit: md5
     path "versions.yml"               , emit: versions
 
     script:
-    def args = task.ext.args ?: ''
     if (meta.single_end) {
         """
         wget \\

diff --git a/modules/local/sra_fastq_ftp/nextflow.config b/modules/local/sra_fastq_ftp/nextflow.config
@@ -1,6 +1,5 @@
 process {
     withName: 'SRA_FASTQ_FTP' {
-        ext.args = '-t 5 -nv -c -T 60'
         publishDir = [
             [
                 path: { "${params.outdir}/fastq" },

diff --git a/modules/nf-core/sratools/fasterqdump/main.nf b/modules/nf-core/sratools/fasterqdump/main.nf
diff --git a/modules/nf-core/sratools/fasterqdump/nextflow.config b/modules/nf-core/sratools/fasterqdump/nextflow.config
diff --git a/modules/nf-core/sratools/fasterqdump/tests/nextflow.config b/modules/nf-core/sratools/fasterqdump/tests/nextflow.config
diff --git a/nextflow.config b/nextflow.config
@@ -19,6 +19,11 @@ params {
     skip_fastq_download         = false
     dbgap_key                   = null
 
+    aspera_cli_args             = '-QT -l 300m -P33001'
+    sra_fastq_ftp_args          = '-t 5 -nv -c -T 60'
+    sratools_fasterqdump_args   = ''
+    sratools_pigz_args          = ''
+
     // Boilerplate options
     outdir                     = null
     publish_dir_mode           = 'copy'

diff --git a/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/main.nf b/subworkflows/nf-core/fastq_download_prefetch_fasterqdump_sratools/main.nf
diff --git a/workflows/sra/main.nf b/workflows/sra/main.nf
@@ -93,7 +93,8 @@ workflow SRA {
         // MODULE: If FTP link is provided in run information then download FastQ directly via FTP and validate with md5sums
         //
         SRA_FASTQ_FTP (
-            ch_sra_reads.ftp
+            ch_sra_reads.ftp,
+            params.sra_fastq_ftp_args ?: ''
         )
         ch_versions = ch_versions.mix(SRA_FASTQ_FTP.out.versions.first())
 
@@ -111,7 +112,8 @@ workflow SRA {
         //
         ASPERA_CLI (
             ch_sra_reads.aspera,
-            'era-fasp'
+            'era-fasp',
+            params.aspera_cli_args ?: ''
         )
         ch_versions = ch_versions.mix(ASPERA_CLI.out.versions.first())