Skip to content

Commit ebbb02b

Browse files
authored
Merge pull request #713 from nf-core/nextflow-duration-fix
Nextflow duration fix
2 parents c0cb097 + eb75b93 commit ebbb02b

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nfcore/base:1.13.2
1+
FROM nfcore/base:1.13.3
22
LABEL authors="The nf-core/eager community" \
33
description="Docker image containing all software requirements for the nf-core/eager pipeline"
44

nextflow_schema.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
"description": "Maximum amount of time that can be requested for any single job.",
306306
"default": "240.h",
307307
"fa_icon": "far fa-clock",
308-
"pattern": "^[\\d\\.]+\\.*(s|m|h|d)$",
308+
"pattern": "^(\\d+(\\.\\d+)?(?:\\s*|\\.?)(s|m|h|d)\\s*)+$",
309309
"hidden": true,
310310
"help_text": "Use to set an upper-limit for the time requirement for each process. Should be a string in the format integer-unit e.g. `--max_time '2.h'`"
311311
}
@@ -609,7 +609,6 @@
609609
},
610610
"bt2n": {
611611
"type": "integer",
612-
"default": 0,
613612
"description": "Specify the -N parameter for bowtie2 (mismatches in seed). This will override defaults from alignmode/sensitivity.",
614613
"fa_icon": "fas fa-sort-numeric-down",
615614
"help_text": "The number of mismatches allowed in the seed during seed-and-extend procedure of Bowtie2. This will override any values set with `--bt2_sensitivity`. Can either be 0 or 1. Default: 0 (i.e. use`--bt2_sensitivity` defaults).\n\n> Modifies Bowtie2 parameters: `-N`",
@@ -620,21 +619,18 @@
620619
},
621620
"bt2l": {
622621
"type": "integer",
623-
"default": 0,
624622
"description": "Specify the -L parameter for bowtie2 (length of seed substrings). This will override defaults from alignmode/sensitivity.",
625623
"fa_icon": "fas fa-ruler-horizontal",
626624
"help_text": "The length of the seed sub-string to use during seeding. This will override any values set with `--bt2_sensitivity`. Default: 0 (i.e. use`--bt2_sensitivity` defaults: [20 for local and 22 for end-to-end](http://bowtie-bio.sourceforge.net/bowtie2/manual.shtml#command-line).\n\n> Modifies Bowtie2 parameters: `-L`"
627625
},
628626
"bt2_trim5": {
629627
"type": "integer",
630-
"default": 0,
631628
"description": "Specify number of bases to trim off from 5' (left) end of read before alignment.",
632629
"fa_icon": "fas fa-cut",
633630
"help_text": "Number of bases to trim at the 5' (left) end of read prior alignment. Maybe useful when left-over sequencing artefacts of in-line barcodes present Default: 0\n\n> Modifies Bowtie2 parameters: `-bt2_trim5`"
634631
},
635632
"bt2_trim3": {
636633
"type": "integer",
637-
"default": 0,
638634
"description": "Specify number of bases to trim off from 3' (right) end of read before alignment.",
639635
"fa_icon": "fas fa-cut",
640636
"help_text": "Number of bases to trim at the 3' (right) end of read prior alignment. Maybe useful when left-over sequencing artefacts of in-line barcodes present Default: 0.\n\n> Modifies Bowtie2 parameters: `-bt2_trim3`"
@@ -685,14 +681,12 @@
685681
},
686682
"bam_mapping_quality_threshold": {
687683
"type": "integer",
688-
"default": 0,
689684
"description": "Minimum mapping quality for reads filter.",
690685
"fa_icon": "fas fa-greater-than-equal",
691686
"help_text": "Specify a mapping quality threshold for mapped reads to be kept for downstream analysis. By default keeps all reads and is therefore set to `0` (basically doesn't filter anything).\n\n> Modifies samtools view parameter: `-q`"
692687
},
693688
"bam_filter_minreadlength": {
694689
"type": "integer",
695-
"default": 0,
696690
"fa_icon": "fas fa-ruler-horizontal",
697691
"description": "Specify minimum read length to be kept after mapping.",
698692
"help_text": "Specify minimum length of mapped reads. This filtering will apply at the same time as mapping quality filtering.\n\nIf used _instead_ of minimum length read filtering at AdapterRemoval, this can be useful to get more realistic endogenous DNA percentages, when most of your reads are very short (e.g. in single-stranded libraries) and would otherwise be discarded by AdapterRemoval (thus making an artificially small denominator for a typical endogenous DNA calculation). Note in this context you should not perform mapping quality filtering nor discarding of unmapped reads to ensure a correct denominator of all reads, for the endogenous DNA calculation.\n\n> Modifies filter_bam_fragment_length.py parameter: `-l`"
@@ -1051,7 +1045,6 @@
10511045
},
10521046
"freebayes_g": {
10531047
"type": "integer",
1054-
"default": 0,
10551048
"description": "Specify to skip over regions of high depth by discarding alignments overlapping positions where total read depth is greater than specified in --freebayes_C.",
10561049
"fa_icon": "fab fa-think-peaks",
10571050
"help_text": "Specify to skip over regions of high depth by discarding alignments overlapping positions where total read depth is greater than specified C. Not set by default.\n\n> Modifies freebayes parameter: `-g`"
@@ -1643,4 +1636,4 @@
16431636
"$ref": "#/definitions/metagenomic_authentication"
16441637
}
16451638
]
1646-
}
1639+
}

0 commit comments

Comments
 (0)