Skip to content

Commit

Permalink
Merge pull request #64 from hoelzer/fix/issue55
Browse files Browse the repository at this point in the history
Fixes a few issues in the ML/issue55 branch
  • Loading branch information
MarieLataretu authored Nov 8, 2023
2 parents ca353fd + b3df249 commit f5aeab7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions envs/multiqc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ name: multiqc
channels:
- bioconda
dependencies:
- python<3.12.0
- multiqc=1.12

4 changes: 3 additions & 1 deletion envs/nanoplot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ channels:
- conda-forge
dependencies:
- nanoplot=1.32.1
- seaborn==0.10.1
- seaborn==0.10.1
- matplotlib<3.6.0
- numpy<1.24.0
10 changes: 5 additions & 5 deletions modules/alignment_processing.nf
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ process idxstats_from_bam {
tuple val(name), val(type), path(bam), path(bai)

output:
tuple val(name), val(type), path('*_idxstats.tsv')
tuple val(name), val(type), path('*.idxstats.tsv')

script:
"""
Expand All @@ -165,13 +165,13 @@ process idxstats_from_bam {
process flagstats_from_bam {
label 'minimap2'

publishDir "${params.output}/minimap2", mode: params.publish_dir_mode, pattern: "${bam.baseName}_flagstats.txt"
publishDir "${params.output}/minimap2", mode: params.publish_dir_mode, pattern: "${bam.baseName}.flagstats.txt"

input:
tuple val(name), val(type), path(bam), path(bai)

output:
tuple val(name), val(type), path('*_flagstats.txt')
tuple val(name), val(type), path('*.flagstats.txt')

script:
"""
Expand All @@ -195,7 +195,7 @@ process sort_bam {
script:
"""
mv ${bam} ${bam}.tmp
samtools sort -@ ${task.cpus} ${bam}.tmp > ${bam.baseName}.bam
samtools sort -@ ${task.cpus} ${bam}.tmp > ${bam.baseName}.sorted.bam
"""
stub:
"""
Expand Down Expand Up @@ -223,4 +223,4 @@ process index_bam {
"""
touch ${bam}.bai
"""
}
}
2 changes: 1 addition & 1 deletion modules/utils.nf
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ process get_read_names {
}

process filter_fastq_by_name {
label 'basics'
label 'minimap2' // We don't need minimap2 but the container has pigz

if ( params.keep ) {
publishDir "${params.output}/${params.tool}", mode: params.publish_dir_mode, pattern: "*.gz"
Expand Down

0 comments on commit f5aeab7

Please sign in to comment.