Skip to content

Commit

Permalink
Merge branch 'dev' into zip_fasta
Browse files Browse the repository at this point in the history
  • Loading branch information
apeltzer authored Dec 17, 2018
2 parents 0d2241d + 1f38063 commit 16d4412
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

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


### `Fixed`
* [#110](https://github.com/nf-core/eager/pull/110) - Fix for [MultiQC Missing Second FastQC report](https://github.com/nf-core/eager/issues/107)
Expand Down
17 changes: 9 additions & 8 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,10 @@ params.bamutils_softclip = false



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

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

input:
file fasta from ch_fasta_for_bwa_indexing
file wherearemyfiles
file wherearemyfiles from ch_where_for_bwa_index

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

input:
file fasta from ch_fasta_for_faidx_indexing
file wherearemyfiles
file wherearemyfiles from ch_where_for_fasta_index

output:
file "${fasta}.fai" into ch_fasta_faidx_index
Expand Down Expand Up @@ -475,7 +476,7 @@ process makeSeqDict {

input:
file fasta from ch_fasta_for_dict_indexing
file wherearemyfiles
file wherearemyfiles from ch_where_for_seqdict

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

input:
file multiqc_config
file multiqc_config from ch_multiqc_config.collect().ifEmpty([])
file ('fastqc_raw/*') from ch_fastqc_results.collect().ifEmpty([])
file('fastqc/*') from ch_fastqc_after_clipping.collect().ifEmpty([])
file ('software_versions/*') from software_versions_yaml.collect().ifEmpty([])
Expand Down Expand Up @@ -1073,7 +1074,7 @@ process output_documentation {
publishDir "${params.outdir}/Documentation", mode: 'copy'

input:
file output_docs
file output_docs from ch_output_docs

output:
file "results_description.html"
Expand Down

0 comments on commit 16d4412

Please sign in to comment.