# HG changeset patch # User artbio # Date 1522794435 14400 # Node ID 6aba6cca3fab207cee2c218d255cf4133fbf362c # Parent cf60c3338279aea8bb5773c98200e5ec54ba8ed1 planemo upload for repository https://github.com/artbio/tools-artbio/tree/master/tools/rsem commit 36c2780df597aa4b14ae9c620457f7460166aaa5 diff -r cf60c3338279 -r 6aba6cca3fab macros.xml --- a/macros.xml Sun Apr 01 18:10:44 2018 -0400 +++ b/macros.xml Tue Apr 03 18:27:15 2018 -0400 @@ -1,6 +1,6 @@ - 0.5.1 + 0.5.4 diff -r cf60c3338279 -r 6aba6cca3fab rsem-bwt2.xml --- a/rsem-bwt2.xml Sun Apr 01 18:10:44 2018 -0400 +++ b/rsem-bwt2.xml Tue Apr 03 18:27:15 2018 -0400 @@ -46,15 +46,15 @@ && #end if - #if $run_rsem.select == "Yes": + #if $run_rsem.select == "Yes" and $run_rsem.input.format == 'fastq': ## uncompress fastq.gz or fastqsanger.gz if needed - #if $run_rsem.input.fastq.matepair=="single": + #if $run_rsem.input.format == 'fastq' and $run_rsem.input.fastq.matepair=="single": #if $run_rsem.input.fastq.singlefastq.is_of_type('fastq.gz') or $run_rsem.input.fastq.singlefastq.is_of_type('fastqsanger.gz'): gunzip < '$run_rsem.input.fastq.singlefastq' > uncomp_single.fastq && #elif $run_rsem.input.fastq.singlefastq.is_of_type('fastq') or $run_rsem.input.fastq.singlefastq.is_of_type('fastqsanger'): ln -f -s '$run_rsem.input.fastq.singlefastq' 'uncomp_single.fastq' && #end if - #elif $run_rsem.input.fastq.matepair=="paired": + #elif $run_rsem.input.format == 'fastq' and $run_rsem.input.fastq.matepair=="paired": #if $run_rsem.input.fastq.fastq1.is_of_type('fastq.gz') or $run_rsem.input.fastq.fastq1.is_of_type('fastqsanger.gz'): gunzip < '$run_rsem.input.fastq.fastq1' > uncomp_pair1.fastq && gunzip < '$run_rsem.input.fastq.fastq2' > uncomp_pair2.fastq && @@ -141,16 +141,6 @@ $run_rsem.input.fasta.fasta1 $run_rsem.input.fasta.fasta2 #end if - #elif $run_rsem.input.format=="sam" - #if $run_rsem.input.matepair=="paired": - --paired-end - #end if - #if $run_rsem.input.rsem_sam._extension == 'sam': - --sam - #elif $run_rsem.input.rsem_sam._extension == 'bam': - --bam - #end if - $run_rsem.input.rsem_sam #end if ## RSEM reference #if $run_rsem.reference.refSrc == 'history': @@ -250,7 +240,6 @@ - @@ -289,14 +278,6 @@ - - - - - - - - diff -r cf60c3338279 -r 6aba6cca3fab rsem.xml --- a/rsem.xml Sun Apr 01 18:10:44 2018 -0400 +++ b/rsem.xml Tue Apr 03 18:27:15 2018 -0400 @@ -48,13 +48,13 @@ #if $run_rsem.select == "Yes": ## uncompress fastq.gz or fastqsanger.gz if needed - #if $run_rsem.input.fastq.matepair=="single": + #if $run_rsem.input.format == 'fastq' and $run_rsem.input.fastq.matepair=="single": #if $run_rsem.input.fastq.singlefastq.is_of_type('fastq.gz') or $run_rsem.input.fastq.singlefastq.is_of_type('fastqsanger.gz'): gunzip < '$run_rsem.input.fastq.singlefastq' > uncomp_single.fastq && #elif $run_rsem.input.fastq.singlefastq.is_of_type('fastq') or $run_rsem.input.fastq.singlefastq.is_of_type('fastqsanger'): ln -f -s '$run_rsem.input.fastq.singlefastq' 'uncomp_single.fastq' && #end if - #elif $run_rsem.input.fastq.matepair=="paired": + #elif $run_rsem.input.format == 'fastq' and $run_rsem.input.fastq.matepair=="paired": #if $run_rsem.input.fastq.fastq1.is_of_type('fastq.gz') or $run_rsem.input.fastq.fastq1.is_of_type('fastqsanger.gz'): gunzip < '$run_rsem.input.fastq.fastq1' > uncomp_pair1.fastq && gunzip < '$run_rsem.input.fastq.fastq2' > uncomp_pair2.fastq && @@ -148,16 +148,6 @@ $run_rsem.input.fasta.fasta1 $run_rsem.input.fasta.fasta2 #end if - #elif $run_rsem.input.format=="sam" - #if $run_rsem.input.matepair=="paired": - --paired-end - #end if - #if $run_rsem.input.rsem_sam._extension == 'sam': - --sam - #elif $run_rsem.input.rsem_sam._extension == 'bam': - --bam - #end if - $run_rsem.input.rsem_sam #end if ## RSEM reference #if $run_rsem.reference.refSrc == 'history': @@ -257,7 +247,6 @@ - @@ -296,14 +285,6 @@ - - - - - - - -