Skip to content

Commit 8066fb7

Browse files
authored
Merge pull request #118 from apeltzer/remove_old_configs
Remove old configs
2 parents 0179654 + 87dfc41 commit 8066fb7

7 files changed

Lines changed: 19 additions & 165 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1010
* [#111](https://github.com/nf-core/eager/pull/110) - Allow [Zipped FastA reference input](https://github.com/nf-core/eager/issues/91)
1111
* [#113](https://github.com/nf-core/eager/pull/113) - All files are now staged via channels, which is considered best practice by Nextflow.
1212
* [#114](https://github.com/nf-core/eager/pull/113) - Add proper runtime defaults for multiple processes
13+
* [#118](https://github.com/nf-core/eager/pull/118) - Add centralized configs handling
1314

1415
### `Fixed`
1516
* [#110](https://github.com/nf-core/eager/pull/110) - Fix for [MultiQC Missing Second FastQC report](https://github.com/nf-core/eager/issues/107)

conf/acad-pheonix.config

Lines changed: 0 additions & 22 deletions
This file was deleted.

conf/binac.config

Lines changed: 0 additions & 22 deletions
This file was deleted.

conf/cfc.config

Lines changed: 0 additions & 25 deletions
This file was deleted.

conf/shh.config

Lines changed: 0 additions & 38 deletions
This file was deleted.

conf/uzh.config

Lines changed: 0 additions & 19 deletions
This file was deleted.

nextflow.config

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,56 +31,35 @@ params {
3131
// AWS Batch
3232
awsqueue = false
3333
awsregion = 'eu-west-1'
34+
35+
igenomesIgnore = false
36+
custom_config_version = 'master'
3437
}
3538

39+
// Load base.config by default for all pipelines
40+
includeConfig 'conf/base.config'
41+
42+
// Load nf-core custom profiles from different Institutions
43+
includeConfig "https://raw.githubusercontent.com/nf-core/configs/${params.custom_config_version}/nfcore_custom.config"
44+
3645
profiles {
46+
awsbatch { includeConfig 'conf/awsbatch.config' }
3747
conda { process.conda = "$baseDir/environment.yml" }
48+
debug { process.beforeScript = 'echo $HOSTNAME' }
3849
docker {
3950
docker.enabled = true
4051
process.container = params.container
4152
}
4253
singularity {
4354
singularity.enabled = true
55+
process.container = {"shub://${params.container.replace('nfcore', 'nf-core')}"}
4456
}
45-
standard {
46-
includeConfig 'conf/base.config'
47-
}
48-
awsbatch {
49-
includeConfig 'conf/base.config'
50-
includeConfig 'conf/awsbatch.config'
51-
includeConfig 'conf/igenomes.config'
52-
}
53-
binac {
54-
includeConfig 'conf/base.config'
55-
includeConfig 'conf/binac.config'
56-
}
57-
uzh {
58-
includeConfig 'conf/base.config'
59-
includeConfig 'conf/uzh.config'
60-
}
61-
phoenix {
62-
includeConfig 'conf/base.config'
63-
includeConfig 'conf/acad-pheonix.config'
64-
}
65-
shh {
66-
includeConfig 'conf/base.config'
67-
includeConfig 'conf/shh.config'
68-
}
69-
cfc {
70-
includeConfig 'conf/base.config'
71-
includeConfig 'conf/cfc.config'
72-
}
73-
standard {
74-
includeConfig 'conf/base.config'
75-
}
76-
test {
77-
includeConfig 'conf/base.config'
78-
includeConfig 'conf/test.config'
79-
}
80-
debug { process.beforeScript = 'echo $HOSTNAME' }
81-
none {
82-
// Don't load any config (for use with custom home configs)
83-
}
57+
test { includeConfig 'conf/test.config' }
58+
}
59+
60+
// Load igenomes.config if required
61+
if(!params.igenomesIgnore){
62+
includeConfig 'conf/igenomes.config'
8463
}
8564

8665
// Capture exit codes from upstream processes when piping

0 commit comments

Comments
 (0)