Mercurial > repos > artbio > rsem

changeset 2:9fa602bc29ec draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/artbio/tools-artbio/tree/master/tools/rsem commit 0d726dfe7f500b597a3b102f101cc2e12c58b279
author artbio
date Mon, 02 Apr 2018 13:23:17 -0400
parents 49795544dac7
children 26ead8419b63
files macros.xml rsem-bwt2.xml rsem.xml
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/macros.xml	Sun Apr 01 18:28:24 2018 -0400
+++ b/macros.xml	Mon Apr 02 13:23:17 2018 -0400
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <macros>
-    <token name="@WRAPPER_VERSION@">0.5.1</token>
+    <token name="@WRAPPER_VERSION@">0.5.3</token>
     <xml name="rsem_options">
         <param name="seedlength" type="integer" value="25" optional="true" label="Seed length used by the read aligner" help="Providing the correct value for this parameter is important for RSEM's accuracy if the data are single-end reads. RSEM uses this value for Bowtie's seed length parameter. The minimum value is 25. (Default:25)">
         </param>
--- a/rsem-bwt2.xml	Sun Apr 01 18:28:24 2018 -0400
+++ b/rsem-bwt2.xml	Mon Apr 02 13:23:17 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 &&
@@ -145,9 +145,9 @@
         #if $run_rsem.input.matepair=="paired":
           --paired-end
         #end if
-        #if $run_rsem.input.rsem_sam._extension == 'sam':
+        #if $run_rsem.input.rsem_sam.is_of_type('sam'):
           --sam
-        #elif $run_rsem.input.rsem_sam._extension == 'bam':
+        #elif $run_rsem.input.rsem_sam.is_of_type('bam'):
           --bam
         #end if
         $run_rsem.input.rsem_sam
@@ -295,7 +295,7 @@
                 <option value="single">Single End Reads</option>
                 <option value="paired">Paired End Reads</option>
               </param>
-              <param name="rsem_sam" type="data" format="rsem_sam" label="RSEM formatted SAM file" />
+              <param name="rsem_sam" type="data" format="sam,bam" label="RSEM formatted SAM file" />
           </when>
         </conditional>
         <expand macro="rsem_options"/>
--- a/rsem.xml	Sun Apr 01 18:28:24 2018 -0400
+++ b/rsem.xml	Mon Apr 02 13:23:17 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 &&
@@ -152,9 +152,9 @@
         #if $run_rsem.input.matepair=="paired":
           --paired-end
         #end if
-        #if $run_rsem.input.rsem_sam._extension == 'sam':
+        #if $run_rsem.input.rsem_sam.is_of_type('sam'):
           --sam
-        #elif $run_rsem.input.rsem_sam._extension == 'bam':
+        #elif $run_rsem.input.rsem_sam.is_of_type('bam'):
           --bam
         #end if
         $run_rsem.input.rsem_sam
@@ -302,7 +302,7 @@
                 <option value="single">Single End Reads</option>
                 <option value="paired">Paired End Reads</option>
               </param>
-              <param name="rsem_sam" type="data" format="rsem_sam" label="RSEM formatted SAM file" />
+              <param name="rsem_sam" type="data" format="sam,bam" label="RSEM formatted SAM file" />
           </when>
         </conditional>
         <expand macro="rsem_options"/>