Skip to content

Commit

Permalink
Merge pull request #556 from nf-core/patch_release_fix
Browse files Browse the repository at this point in the history 
Address review comments for Patch release v1.2.1
  • Loading branch information
@LilyAnderssonLee
LilyAnderssonLee authored Nov 28, 2024
2 parents 1a27aaa + 2a64aed commit acd85cc
Show file tree
Hide file tree
Showing 14 changed files with 193 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v1.2.1 - Bouncy Basenji Patch [2024-11-27]
## v1.2.1 - Bouncy Basenji Patch [2024-11-28]

### `Added`

Expand Down
26 changes: 25 additions & 1 deletion conf/test.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,40 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: MEGAN_RMA2INFO_TSV {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = "-c2c Taxonomy"
ext.prefix = { "${meta.id}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{txt.gz,megan}'
]
}
withName: MEGAN_RMA2INFO_KRONA {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "--read2class Taxonomy" }
ext.prefix = { "${meta.id}_${meta.db_name}" }
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
15 changes: 14 additions & 1 deletion conf/test_alternativepreprocessing.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
15 changes: 14 additions & 1 deletion conf/test_bbduk.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
15 changes: 14 additions & 1 deletion conf/test_falco.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
15 changes: 14 additions & 1 deletion conf/test_fastp.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
25 changes: 25 additions & 0 deletions conf/test_krakenuniq.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,40 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: MEGAN_RMA2INFO_TSV {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = "-c2c Taxonomy"
ext.prefix = { "${meta.id}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{txt.gz,megan}'
]
}
withName: MEGAN_RMA2INFO_KRONA {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "--read2class Taxonomy" }
ext.prefix = { "${meta.id}_${meta.db_name}" }
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
14 changes: 14 additions & 0 deletions conf/test_malt.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
14 changes: 14 additions & 0 deletions conf/test_motus.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
15 changes: 14 additions & 1 deletion conf/test_nopreprocessing.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
14 changes: 14 additions & 0 deletions conf/test_noprofiling.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
15 changes: 14 additions & 1 deletion conf/test_nothing.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
15 changes: 14 additions & 1 deletion conf/test_prinseqplusplus.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,23 @@ params {

process {
withName: MALT_RUN {
tag = {"${meta.db_name}|${meta.id}"}
maxForks = 1
ext.args = { "-m ${params.malt_mode} -J-Xmx12G" }
ext.args = { "${meta.db_params} -m ${params.malt_mode} -J-Xmx12G" }
ext.prefix = { "${meta.db_name}" }
publishDir = [
path: { "${params.outdir}/malt/${meta.db_name}/" },
mode: params.publish_dir_mode,
pattern: '*.{rma6,log,sam}'
]
}
withName: NONPAREIL_NONPAREIL {
ext.args = { "-k 5" }
ext.prefix = { "${meta.id}_${meta.run_accession}" }
publishDir = [
path: { "${params.outdir}/nonpareil/" },
mode: params.publish_dir_mode,
pattern: '*.np{a,c,l,o}'
]
}
}
5 changes: 2 additions & 3 deletions nextflow.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ params {

// Load base.config by default for all pipelines
includeConfig 'conf/base.config'
// Load modules.config for DSL2 module specific options
includeConfig 'conf/modules.config'

profiles {
debug {
Expand Down Expand Up @@ -414,6 +416,3 @@ validation {
afterText = validation.help.afterText
}
}

// Load modules.config for DSL2 module specific options
includeConfig 'conf/modules.config'

0 comments on commit acd85cc

Please sign in to comment.