mirror of
https://github.com/MillironX/taxprofiler.git
synced 2024-11-13 05:53:09 +00:00
Fix porechop conflict
This commit is contained in:
parent
074d3ec204
commit
3faea8aac5
4 changed files with 13 additions and 14 deletions
|
@ -141,9 +141,9 @@
|
|||
"branch": "master",
|
||||
"git_sha": "5e34754d42cd2d5d248ca8673c0a53cdf5624905"
|
||||
},
|
||||
"porechop": {
|
||||
"porechop/porechop": {
|
||||
"branch": "master",
|
||||
"git_sha": "5e34754d42cd2d5d248ca8673c0a53cdf5624905"
|
||||
"git_sha": "2a4e85eb81875a572bb58133e37f84ba3cc484d7"
|
||||
},
|
||||
"prinseqplusplus": {
|
||||
"branch": "master",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
process PORECHOP {
|
||||
process PORECHOP_PORECHOP {
|
||||
tag "$meta.id"
|
||||
label 'process_medium'
|
||||
|
||||
|
@ -28,7 +28,6 @@ process PORECHOP {
|
|||
$args \\
|
||||
-o ${prefix}.fastq.gz \\
|
||||
> ${prefix}.log
|
||||
|
||||
cat <<-END_VERSIONS > versions.yml
|
||||
"${task.process}":
|
||||
porechop: \$( porechop --version )
|
|
@ -1,4 +1,4 @@
|
|||
name: porechop
|
||||
name: "porechop_porechop"
|
||||
description: Adapter removal and demultiplexing of Oxford Nanopore reads
|
||||
keywords:
|
||||
- adapter
|
|
@ -5,7 +5,7 @@
|
|||
include { FASTQC as FASTQC_PROCESSED } from '../../modules/nf-core/fastqc/main'
|
||||
include { FALCO as FALCO_PROCESSED } from '../../modules/nf-core/falco/main'
|
||||
|
||||
include { PORECHOP } from '../../modules/nf-core/porechop/main'
|
||||
include { PORECHOP_PORECHOP } from '../../modules/nf-core/porechop/porechop/main'
|
||||
include { FILTLONG } from '../../modules/nf-core/filtlong/main'
|
||||
|
||||
workflow LONGREAD_PREPROCESSING {
|
||||
|
@ -17,9 +17,9 @@ workflow LONGREAD_PREPROCESSING {
|
|||
ch_multiqc_files = Channel.empty()
|
||||
|
||||
if ( !params.longread_qc_skipadaptertrim && params.longread_qc_skipqualityfilter) {
|
||||
PORECHOP ( reads )
|
||||
PORECHOP_PORECHOP ( reads )
|
||||
|
||||
ch_processed_reads = PORECHOP.out.reads
|
||||
ch_processed_reads = PORECHOP_PORECHOP.out.reads
|
||||
.map {
|
||||
meta, reads ->
|
||||
def meta_new = meta.clone()
|
||||
|
@ -27,8 +27,8 @@ workflow LONGREAD_PREPROCESSING {
|
|||
[ meta_new, reads ]
|
||||
}
|
||||
|
||||
ch_versions = ch_versions.mix(PORECHOP.out.versions.first())
|
||||
ch_multiqc_files = ch_multiqc_files.mix( PORECHOP.out.log )
|
||||
ch_versions = ch_versions.mix(PORECHOP_PORECHOP.out.versions.first())
|
||||
ch_multiqc_files = ch_multiqc_files.mix( PORECHOP_PORECHOP.out.log )
|
||||
|
||||
} else if ( params.longread_qc_skipadaptertrim && !params.longread_qc_skipqualityfilter) {
|
||||
|
||||
|
@ -37,8 +37,8 @@ workflow LONGREAD_PREPROCESSING {
|
|||
ch_multiqc_files = ch_multiqc_files.mix( FILTLONG.out.log )
|
||||
|
||||
} else {
|
||||
PORECHOP ( reads )
|
||||
ch_clipped_reads = PORECHOP.out.reads
|
||||
PORECHOP_PORECHOP ( reads )
|
||||
ch_clipped_reads = PORECHOP_PORECHOP.out.reads
|
||||
.map {
|
||||
meta, reads ->
|
||||
def meta_new = meta.clone()
|
||||
|
@ -48,9 +48,9 @@ workflow LONGREAD_PREPROCESSING {
|
|||
|
||||
ch_processed_reads = FILTLONG ( ch_clipped_reads.map{ meta, reads -> [meta, [], reads ]} ).reads
|
||||
|
||||
ch_versions = ch_versions.mix(PORECHOP.out.versions.first())
|
||||
ch_versions = ch_versions.mix(PORECHOP_PORECHOP.out.versions.first())
|
||||
ch_versions = ch_versions.mix(FILTLONG.out.versions.first())
|
||||
ch_multiqc_files = ch_multiqc_files.mix( PORECHOP.out.log )
|
||||
ch_multiqc_files = ch_multiqc_files.mix( PORECHOP_PORECHOP.out.log )
|
||||
ch_multiqc_files = ch_multiqc_files.mix( FILTLONG.out.log )
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue