Skip to content

Commit 16d4412

Browse files
authored
Merge branch 'dev' into zip_fasta
2 parents 0d2241d + 1f38063 commit 16d4412

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
88

99
### `Added`
1010
* [#111](https://github.com/nf-core/eager/pull/110) - Allow [Zipped FastA reference input](https://github.com/nf-core/eager/issues/91)
11+
* [#113](https://github.com/nf-core/eager/pull/113) - All files are now staged via channels, which is considered best practice by Nextflow.
12+
1113

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

main.nf

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,10 @@ params.bamutils_softclip = false
211211

212212

213213

214-
multiqc_config = file(params.multiqc_config)
215-
output_docs = file("$baseDir/docs/output.md")
216-
wherearemyfiles = file("$baseDir/assets/where_are_my_files.txt")
214+
ch_multiqc_config = Channel.fromPath(params.multiqc_config)
215+
ch_output_docs = Channel.fromPath("$baseDir/docs/output.md")
216+
Channel.fromPath("$baseDir/assets/where_are_my_files.txt")
217+
.into{ ch_where_for_bwa_index; ch_where_for_fasta_index; ch_where_for_seqdict}
217218

218219
// Validate inputs
219220
if("${params.fasta}".endsWith(".gz")){
@@ -418,7 +419,7 @@ process makeBWAIndex {
418419

419420
input:
420421
file fasta from ch_fasta_for_bwa_indexing
421-
file wherearemyfiles
422+
file wherearemyfiles from ch_where_for_bwa_index
422423

423424
output:
424425
file "*.{amb,ann,bwt,pac,sa,fasta,fa}" into (ch_bwa_index,ch_bwa_index_bwamem)
@@ -445,7 +446,7 @@ process makeFastaIndex {
445446

446447
input:
447448
file fasta from ch_fasta_for_faidx_indexing
448-
file wherearemyfiles
449+
file wherearemyfiles from ch_where_for_fasta_index
449450

450451
output:
451452
file "${fasta}.fai" into ch_fasta_faidx_index
@@ -475,7 +476,7 @@ process makeSeqDict {
475476

476477
input:
477478
file fasta from ch_fasta_for_dict_indexing
478-
file wherearemyfiles
479+
file wherearemyfiles from ch_where_for_seqdict
479480

480481
output:
481482
file "*.dict" into ch_seq_dict
@@ -1037,7 +1038,7 @@ process multiqc {
10371038
publishDir "${params.outdir}/MultiQC", mode: 'copy'
10381039

10391040
input:
1040-
file multiqc_config
1041+
file multiqc_config from ch_multiqc_config.collect().ifEmpty([])
10411042
file ('fastqc_raw/*') from ch_fastqc_results.collect().ifEmpty([])
10421043
file('fastqc/*') from ch_fastqc_after_clipping.collect().ifEmpty([])
10431044
file ('software_versions/*') from software_versions_yaml.collect().ifEmpty([])
@@ -1073,7 +1074,7 @@ process output_documentation {
10731074
publishDir "${params.outdir}/Documentation", mode: 'copy'
10741075

10751076
input:
1076-
file output_docs
1077+
file output_docs from ch_output_docs
10771078

10781079
output:
10791080
file "results_description.html"

0 commit comments

Comments
 (0)