Skip to content

Commit d977daf

Browse files
committed
change publishdir to copy; update changelog; conda env specifics
1 parent 35ceacb commit d977daf

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6-
## v1.0 [] - [03/25/2022]
6+
## v1.0 Espresso Myconaut - [03/25/2022]
77

88
Initial release of CDCgov/mycosnp-nf, created with the [nf-core](https://nf-co.re/) template.
99

@@ -27,8 +27,8 @@ Initial release of CDCgov/mycosnp-nf, created with the [nf-core](https://nf-co.r
2727
* nf-core
2828
### `Deprecated`
2929

30+
* GeneFlow support
3031
* QC pdf report
31-
3232
### `TODO`
3333

3434
* Intermediate file cleanup and management

conf/base.config

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
process {
1212

13-
// TODO nf-core: Check the defaults for all processes
1413
cpus = { check_max( 1 * task.attempt, 'cpus' ) }
1514
memory = { check_max( 6.GB * task.attempt, 'memory' ) }
1615
time = { check_max( 4.h * task.attempt, 'time' ) }
@@ -24,25 +23,24 @@ process {
2423
// These labels are used and recognised by default in DSL2 files hosted on nf-core/modules.
2524
// If possible, it would be nice to keep the same label naming convention when
2625
// adding in your local modules too.
27-
// TODO nf-core: Customise requirements for specific processes.
2826
// See https://www.nextflow.io/docs/latest/config.html#config-process-selectors
2927
withLabel:process_low {
3028
cpus = { check_max( 2 * task.attempt, 'cpus' ) }
31-
memory = { check_max( 12.GB * task.attempt, 'memory' ) }
32-
time = { check_max( 4.h * task.attempt, 'time' ) }
29+
memory = { check_max( 6.GB * task.attempt, 'memory' ) }
30+
time = { check_max( 24.h * task.attempt, 'time' ) }
3331
}
3432
withLabel:process_medium {
35-
cpus = { check_max( 2 * task.attempt, 'cpus' ) }
36-
memory = { check_max( 12.GB * task.attempt, 'memory' ) }
37-
time = { check_max( 4.h * task.attempt, 'time' ) }
33+
cpus = { check_max( 4 * task.attempt, 'cpus' ) }
34+
memory = { check_max( 6.GB * task.attempt, 'memory' ) }
35+
time = { check_max( 24.h * task.attempt, 'time' ) }
3836
}
3937
withLabel:process_high {
40-
cpus = { check_max( 2 * task.attempt, 'cpus' ) }
38+
cpus = { check_max( 4 * task.attempt, 'cpus' ) }
4139
memory = { check_max( 12.GB * task.attempt, 'memory' ) }
42-
time = { check_max( 4.h * task.attempt, 'time' ) }
40+
time = { check_max( 48.h * task.attempt, 'time' ) }
4341
}
4442
withLabel:process_long {
45-
time = { check_max( 20.h * task.attempt, 'time' ) }
43+
time = { check_max( 72.h * task.attempt, 'time' ) }
4644
}
4745
withLabel:process_high_memory {
4846
memory = { check_max( 64.GB * task.attempt, 'memory' ) }
@@ -52,7 +50,7 @@ process {
5250
}
5351
withLabel:error_retry {
5452
errorStrategy = 'retry'
55-
maxRetries = 2
53+
maxRetries = 3
5654
}
5755
withName:CUSTOM_DUMPSOFTWAREVERSIONS {
5856
cache = false

docs/usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Alternatively, you can install nextflow and other dependencies via conda like so:
2424

2525
```console
26-
conda create -n nextflow -c bioconda -c conda-forge nf-core nextflow git graphviz
26+
conda create -n nextflow -c bioconda -c conda-forge nf-core=2.2 nextflow=21.10.6 git=2.35.0 openjdk=8.0312 graphviz
2727
conda activate nextflow
2828
```
2929

nextflow.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ params {
3939

4040
// Config options
4141
custom_config_version = 'master'
42-
// TODO - add hpc config profiles
4342
custom_config_base = "https://raw.githubusercontent.com/nf-core/configs/${params.custom_config_version}"
4443
config_profile_description = null
4544
config_profile_contact = null
@@ -62,7 +61,7 @@ params {
6261
vcftools_filter = '--min_GQ "50" --keep_GQ_0_refs --min_percent_alt_in_AD "0.8" --min_total_DP "10" --keep_all_ref'
6362
max_amb_samples = 10000000
6463
max_perc_amb_samples = 10
65-
publish_dir_mode = 'symlink'
64+
publish_dir_mode = 'copy'
6665
rapidnj = true
6766
fasttree = true
6867
iqtree = false
@@ -198,7 +197,7 @@ manifest {
198197
description = 'MycoSNP is a portable workflow for performing whole genome sequencing analysis of fungal organisms, including Candida auris. This method prepares the reference, performs quality control, and calls variants using a reference. MycoSNP generates several output files that are compatible with downstream analytic tools, such as those for used for phylogenetic tree-building and gene variant annotations.'
199198
mainScript = 'main.nf'
200199
nextflowVersion = '!>=21.10.3'
201-
version = '1.0dev'
200+
version = 'v1.0'
202201
}
203202

204203
// Load modules.config for DSL2 module specific options

0 commit comments

Comments
 (0)