Mercurial > repos > lecorguille > camera_annotate

diff abims_CAMERA_annotateDiffreport.xml @ 35:b02797fbead1 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload commit 688b63e161c4df4364d248bf78536a7649564db4
author lecorguille
date Fri, 17 Aug 2018 06:45:55 -0400
parents 34d89b4ad869
children b6a8143c397c
line wrap: on
line diff
--- a/abims_CAMERA_annotateDiffreport.xml	Thu Mar 01 08:04:16 2018 -0500
+++ b/abims_CAMERA_annotateDiffreport.xml	Fri Aug 17 06:45:55 2018 -0400
@@ -1,4 +1,4 @@
-<tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.2">
+<tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.3">
 
     <description>CAMERA annotate function. Returns annotation results (isotope peaks, adducts and fragments) and a diffreport if more than one condition.</description>
 
@@ -191,14 +191,14 @@
     </outputs>
 
     <tests>
-        <test>
+        <!--<test>
             <param name="image" value="faahKO.xset.group.retcor.group.fillpeaks.RData"/>
             <expand macro="test_annotate_diffreport"/>
             <expand macro="test_annotate_quick_true"/>
             <expand macro="test_file_load_zip"/>
             <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata.tsv" />
             <output name="datamatrix" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.dataMatrix.tsv" />
-        </test>
+        </test>-->
         <test>
             <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/>
             <expand macro="test_annotate_diffreport"/>
@@ -208,6 +208,14 @@
             <output name="datamatrix" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.dataMatrix.tsv" />
         </test>
         <test>
+            <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks-xcms3.RData"/>
+            <expand macro="test_annotate_diffreport"/>
+            <expand macro="test_annotate_quick_true"/>
+            <expand macro="test_file_load_single"/>
+            <output name="variableMetadata" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.variableMetadata-xcms3.tsv" />
+            <output name="datamatrix" file="faahKO.xset.group.retcor.group.fillPeaks.annotate.dataMatrix-xcms3.tsv" />
+        </test>
+        <test>
             <param name="image" value="faahKO-single.xset.merged.group.retcor.group.fillpeaks.RData"/>
             <expand macro="test_annotate_diffreport"/>
             <conditional name="quick_block">
@@ -424,6 +432,10 @@
 Changelog/News
 --------------
 
+**Version 2.2.3 - 30/04/2018**
+
+- NEW: support the new xcms 3.0.0 wrapper
+
 **Version 2.2.2 - 01/03/2018**
 
 - UPGRADE: upgrate the CAMERA version from 1.26.0 to 1.32.0