Merge branch 'dev' into fix-mirtrace-staging-bug

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## v2.3.1 - XXXX-XX-XX- Gray Zinc Dalmation Patch
 
 - [[#328]](https://github.com/nf-core/smrnaseq/pull/328) - Fix [casting issue](https://github.com/nf-core/smrnaseq/issues/327) in mirtrace module
+- [[#334]](https://github.com/nf-core/smrnaseq/pull/334) - Fix [input channel cardinality](https://github.com/nf-core/smrnaseq/issues/331) in `MIRDEEP2_RUN` module
+- [[#334]](https://github.com/nf-core/smrnaseq/pull/334) - Fix [bowtie conda version](https://github.com/nf-core/smrnaseq/issues/333) in `BOWTIE_MAP_SEQ` module
 - [[#335]](https://github.com/nf-core/smrnaseq/pull/335) - Final fix for [casting issue](https://github.com/nf-core/smrnaseq/issues/327) in mirtrace module
 
 ### Software dependencies

modules/local/bowtie_map_mirna.nf

@@ -2,7 +2,7 @@ process BOWTIE_MAP_SEQ {
     tag "$meta.id"
     label 'process_medium'
 
-    conda 'bowtie=1.3.0-2 bioconda::samtools=1.13'
+    conda 'bowtie=1.3.0 bioconda::samtools=1.13'
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:40128b496751b037e2bd85f6789e83d4ff8a4837-0' :
         'biocontainers/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:40128b496751b037e2bd85f6789e83d4ff8a4837-0' }"

modules/local/mirdeep2_run.nf

@@ -12,8 +12,8 @@ process MIRDEEP2_RUN {
     input:
     path(fasta)
     tuple path(reads), path(arf)
-    tuple val(meta2), path(hairpin)
-    tuple val(meta2), path(mature)
+    path(hairpin)
+    path(mature)
 
     output:
     path 'result*.{bed,csv,html}', emit: result