Mercurial > repos > mmonsoor > camera_combinexsannos

changeset 18:78d267387462 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload commit 757700163128641f447d6fd089f2649d60a82f15
author lecorguille
date Thu, 01 Mar 2018 08:04:39 -0500
parents 7315b5f33b5e
children 608b4b95818b
files README.rst abims_CAMERA_combinexsAnnos.xml macros.xml
diffstat 3 files changed, 25 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/README.rst	Wed Apr 05 11:28:17 2017 -0400
+++ b/README.rst	Thu Mar 01 08:04:39 2018 -0500
@@ -2,6 +2,16 @@
 Changelog/News
 --------------
 
+**Version 2.2.2 - 01/03/2018**
+
+- UPGRADE: upgrate the CAMERA version from 1.26.0 to 1.32.0
+
+
+**Version 2.0.7 - 29/11/2017**
+
+- BUGFIX: To avoid issues with accented letter in the parentFile tag of the mzXML files, we changed a hidden mechanim to LC_ALL=C
+
+
 **Version 2.0.6 - 10/02/2017**
 
 - IMPROVEMENT: Synchronize the variableMetadata export option with the other tools (xcms.group, xcms.fillpeaks, camera.annotate)
@@ -33,7 +43,7 @@
 
 **Version 2.0.0 - 09/06/2015**
 
-- NEW: combinexsAnnos Check CAMERA ion species annotation due to matching with opposite ion mode 
+- NEW: combinexsAnnos Check CAMERA ion species annotation due to matching with opposite ion mode
 
 
 Test Status
--- a/abims_CAMERA_combinexsAnnos.xml	Wed Apr 05 11:28:17 2017 -0400
+++ b/abims_CAMERA_combinexsAnnos.xml	Thu Mar 01 08:04:39 2018 -0500
@@ -1,4 +1,4 @@
-<tool id="abims_CAMERA_combinexsAnnos" name="CAMERA.combinexsAnnos" version="2.0.6">
+<tool id="abims_CAMERA_combinexsAnnos" name="CAMERA.combinexsAnnos" version="2.2.2">
 
     <description>Wrapper function for the combinexsAnnos CAMERA function. Returns a dataframe with recalculated annotations.</description>
 
@@ -209,6 +209,15 @@
 Changelog/News
 --------------
 
+**Version 2.2.2 - 01/03/2018**
+
+- UPGRADE: upgrate the CAMERA version from 1.26.0 to 1.32.0
+
+**Version 2.0.7 - 29/11/2017**
+
+- BUGFIX: To avoid issues with accented letter in the parentFile tag of the mzXML files, we changed a hidden mechanim to LC_ALL=C
+
+
 **Version 2.0.6 - 10/02/2017**
 
 - IMPROVEMENT: Synchronize the variableMetadata export option with the other tools (xcms.group, xcms.fillpeaks, camera.annotate)
--- a/macros.xml	Wed Apr 05 11:28:17 2017 -0400
+++ b/macros.xml	Thu Mar 01 08:04:39 2018 -0500
@@ -2,9 +2,9 @@
 <macros>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="0.4_1">r-snow</requirement>
-            <requirement type="package" version="1.26.0">bioconductor-camera</requirement>
-            <requirement type="package" version="2.26.0">bioconductor-multtest</requirement>
+            <requirement type="package" version="0.4_2">r-snow</requirement>
+            <requirement type="package" version="1.32.0">bioconductor-camera</requirement>
+            <requirement type="package" version="2.28.0">bioconductor-multtest</requirement>
             <requirement type="package" version="1.1_4">r-batch</requirement>
             <requirement type="package" version="1.3.23">graphicsmagick</requirement>
         </requirements>
@@ -16,7 +16,7 @@
     </xml>
 
     <token name="@COMMAND_CAMERA_SCRIPT@">
-        LANG=C Rscript $__tool_directory__/CAMERA.r
+        LC_ALL=C Rscript $__tool_directory__/CAMERA.r
     </token>
 
     <!-- raw file load for planemo test -->