Skip to content
This repository has been archived by the owner on Aug 21, 2018. It is now read-only.

Commit

Permalink
Merge pull request #156 from ewels/master
Browse files Browse the repository at this point in the history
v1.3.1 hotfix for version number
  • Loading branch information
Hammarn authored Oct 16, 2017
2 parents 627f99b + a7381cf commit 69fadcb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# NGI-RNAseq

## [1.3.1](https://github.com/SciLifeLab/NGI-RNAseq/releases/tag/1.3.1) - 2017-10-16
Hotfix to update version number in pipeline script.

## [1.3](https://github.com/SciLifeLab/NGI-RNAseq/releases/tag/1.3) - 2017-10-10

* Updated HISAT2 from v2.0.5 to v2.1.0
Expand All @@ -16,7 +19,7 @@
* Script now checks that the version of Nextflow is recent enough and warns if not
* New `--help` function to give usage help
* Software versions are now collected at run time and added to MultiQC and pipeline reports.
* RSeQC has been refactored, and geneBody_coverage.py moved into it's own process.
* RSeQC has been refactored, and geneBody_coverage.py moved into it's own process.
* The way config files work has been changed. Config settings are now inherited from `base.config` instead of `uppmax.config`
* igenome.config needs to be last in the profile definition for the inhertence to work properly

Expand Down
12 changes: 6 additions & 6 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def helpMessage() {
*/

// Pipeline version
version = '1.2'
version = '1.3.1'

// Show help emssage
params.help = false
Expand Down Expand Up @@ -733,7 +733,7 @@ process rseqc {
* Step 4.1 Rseqc genebody_coverage
*/
process genebody_coverage {
tag "${bam_geneBodyCoverage.baseName - '.sorted'}"
tag "${bam_geneBodyCoverage.baseName - '.sorted'}"
publishDir "${params.outdir}/rseqc" , mode: 'copy',
saveAs: {filename ->
if (filename.indexOf("geneBodyCoverage.curves.pdf") > 0) "geneBodyCoverage/$filename"
Expand All @@ -745,15 +745,15 @@ process genebody_coverage {
input:
file bam_geneBodyCoverage
file bed12 from bed_genebody_coverage.collect()

output:
file "*.{txt,pdf,r,xls}" into genebody_coverage_results

script:
"""
cat <(samtools view -H ${bam_geneBodyCoverage}) \\
<(samtools view ${bam_geneBodyCoverage} | shuf -n 1000000) \\
| samtools sort - -o ${bam_geneBodyCoverage.baseName}_subsamp_sorted.bam
| samtools sort - -o ${bam_geneBodyCoverage.baseName}_subsamp_sorted.bam
samtools index ${bam_geneBodyCoverage.baseName}_subsamp_sorted.bam
geneBody_coverage.py -i ${bam_geneBodyCoverage.baseName}_subsamp_sorted.bam -o ${bam_geneBodyCoverage.baseName}.rseqc -r $bed12
"""
Expand Down Expand Up @@ -886,7 +886,7 @@ process featureCounts {
featureCounts_direction = 2
}
"""
featureCounts -a $gtf -g gene_id -o ${bam_featurecounts.baseName}_gene.featureCounts.txt -p -s $featureCounts_direction $bam_featurecounts
featureCounts -a $gtf -g gene_id -o ${bam_featurecounts.baseName}_gene.featureCounts.txt -p -s $featureCounts_direction $bam_featurecounts
featureCounts -a $gtf -g gene_biotype -o ${bam_featurecounts.baseName}_biotype.featureCounts.txt -p -s $featureCounts_direction $bam_featurecounts
cut -f 1,7 ${bam_featurecounts.baseName}_biotype.featureCounts.txt > ${bam_featurecounts.baseName}_biotype_counts.txt
"""
Expand Down

0 comments on commit 69fadcb

Please sign in to comment.