diff align_and_estimate_abundance.xml @ 6:04bd98a9c751 draft

planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/trinity commit bc4ea54f0deec4ddec8e6cf79fd547491e165686

--- a/align_and_estimate_abundance.xml	Fri Mar 31 11:37:01 2017 -0400
+++ b/align_and_estimate_abundance.xml	Mon Aug 28 16:54:12 2017 -0400
@@ -1,4 +1,4 @@
-<tool id="trinity_align_and_estimate_abundance" name="Align reads and estimate abundance" version="@WRAPPER_VERSION@.0">
+<tool id="trinity_align_and_estimate_abundance" name="Align reads and estimate abundance" version="@WRAPPER_VERSION@.2">
     <description>on a de novo assembly of RNA-Seq data</description>
     <macros>
         <import>macros.xml</import>
@@ -8,6 +8,7 @@
         <requirement type="package" version="1.5.1">express</requirement>
         <!-- Cannot update to salmon 0.8.2 because in Bioconda it requires icu 58, while r-base 3.3.1 requires icu 54 -->
         <requirement type="package" version="0.8.1">salmon</requirement>
+        <requirement type="package" version="0.43.1">kallisto</requirement>
     </expand>
     <command detect_errors="aggressive"><![CDATA[
         ln -f -s '$transcripts' input.fa &&
@@ -125,6 +126,7 @@
                 <option value="RSEM">RSEM</option>
                 <option value="eXpress">eXpress</option>
                 <option value="salmon">Salmon</option>
+                <option value="kallisto">Kallisto</option>
             </param>
             <when value="RSEM">
                 <param type="select" name="aln_method" argument="--aln_method" label="Alignment method">
@@ -144,6 +146,8 @@
                     <option value="fmd">FMD</option>
                 </param>
             </when>
+            <when value="kallisto">
+            </when>
         </conditional>
 
         <section name="additional_params" title="Additional Options" expanded="False">
@@ -182,6 +186,13 @@
         <data format="tabular" name="genes_counts_salmon" label="${tool.name} on ${on_string}: genes counts" from_work_dir="output/quant.sf.genes">
             <filter>method['est_method'] == "salmon"</filter>
         </data>
+
+        <data format="tabular" name="isoforms_counts_kallisto" label="${tool.name} on ${on_string}: isoforms counts" from_work_dir="output/abundance.tsv">
+            <filter>method['est_method'] == "kallisto"</filter>
+        </data>
+        <data format="tabular" name="genes_counts_kallisto" label="${tool.name} on ${on_string}: genes counts" from_work_dir="output/abundance.tsv.genes">
+            <filter>method['est_method'] == "kallisto"</filter>
+        </data>
     </outputs>
     <tests>
         <test>
@@ -250,8 +261,7 @@
                 </assert_contents>
             </output>
         </test>
-        <!-- test disabled because broken in travis, probably due to conda/symlink problem-->
-        <!--test>
+        <test>
             <param name="paired_or_single" value="paired"/>
             <param name="left_input" value="reads.left.fq"/>
             <param name="right_input" value="reads.right.fq"/>
@@ -272,7 +282,28 @@
                     <has_n_columns n="5" />
                 </assert_contents>
             </output>
-        </test-->
+        </test>
+        <test>
+            <param name="paired_or_single" value="paired"/>
+            <param name="left_input" value="reads.left.fq"/>
+            <param name="right_input" value="reads.right.fq"/>
+            <param name="transcripts" value="raw/Trinity.fasta"/>
+            <param name="library_type" value="RF"/>
+            <param name="est_method" value="kallisto"/>
+            <param name="has_gene_map" value="yes"/>
+            <output name="isoforms_counts_kallisto">
+                <assert_contents>
+                    <has_line_matching expression="TRINITY_DN1_c0_g1_i1&#009;.*" />
+                    <has_n_columns n="5" />
+                </assert_contents>
+            </output>
+            <output name="genes_counts_kallisto">
+                <assert_contents>
+                    <has_line_matching expression="TRINITY_DN1_c0_g1&#009;.*" />
+                    <has_n_columns n="5" />
+                </assert_contents>
+            </output>
+        </test>
     </tests>
     <help>
 <![CDATA[