diff xcms_merge.xml @ 8:6b5504f877ff draft

planemo upload for repository https://github.com/workflow4metabolomics/xcms commit 7b226c3ba91a3cf654ec1c14b3ef85090968bb0f

--- a/xcms_merge.xml	Thu Mar 01 04:15:19 2018 -0500
+++ b/xcms_merge.xml	Mon Mar 05 04:16:12 2018 -0500
@@ -29,10 +29,16 @@
 
     <outputs>
         <data name="xsetRData" format="rdata.xcms.raw" label="xset.merged.RData" from_work_dir="merged.RData" />
+        <data name="sampleMetadataOutput" format="tabular" label="xset.merged.sampleMetadata.tsv" from_work_dir="sampleMetadata.tsv">
+            <filter>not sampleMetadata</filter>
+        </data>
+        <data name="ticsRawPdf" format="pdf" label="xset.merged.xset.TICs_raw.pdf" from_work_dir="TICs.pdf"  />
+        <data name="bpcsRawPdf" format="pdf" label="xset.merged.xset.BPCs_raw.pdf" from_work_dir="BICs.pdf" />
     </outputs>
 
     <tests>
-        <!--<test>
+        <!-- DISABLE FOR TRAVIS
+        <test>
             <param name="images" value="ko15-xset.RData,ko16-xset.RData,wt15-xset.RData,wt16-xset.RData" />
             <expand macro="test_file_load_single"/>
             <assert_stdout>
@@ -43,7 +49,9 @@
                 <has_text text="Peak Groups: 0" />
                 <has_text text="Sample classes: ." />
             </assert_stdout>
-        </test>-->
+            <output name="sampleMetadataOutput" file="noclass.merged.sampleMetadata.tsv" />
+        </test>
+        -->
         <test>
             <param name="images" value="ko15-xset.RData,ko16-xset.RData,wt15-xset.RData,wt16-xset.RData" />
             <expand macro="test_file_load_single"/>
@@ -165,6 +173,10 @@
 
 - UPGRADE: upgrade the xcms version from 1.46.0 to 3.0.0. So refactoring of a lot of underlining codes and methods
 
+**Version 1.0.1 - 13/02/2017**
+
+- IMPROVMENT: the tool will now raise an error if a sample isn't describe in the sampleMetadata file
+
 **Version 1.0.0 - 03/02/2017**
 
 - NEW: a new tool to merge individual xcmsSet outputs to be used by xcms.group