Mercurial > repos > lecorguille > camera_annotate

changeset 34:34d89b4ad869 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:16 -0500
parents 3b2b642542f6
children b02797fbead1
files README.rst abims_CAMERA_annotateDiffreport.xml macros.xml
diffstat 3 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/README.rst	Wed Apr 05 11:27:56 2017 -0400
+++ b/README.rst	Thu Mar 01 08:04:16 2018 -0500
@@ -2,6 +2,14 @@
 Changelog/News
 --------------
 
+**Version 2.2.2 - 01/03/2018**
+
+- UPGRADE: upgrate the CAMERA version from 1.26.0 to 1.32.0
+
+**Version 2.2.1 - 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.2.0 - 03/02/2017**
 
 - BUGFIX: the diffreport ids didn't convert the rt in minute as the other export
--- a/abims_CAMERA_annotateDiffreport.xml	Wed Apr 05 11:27:56 2017 -0400
+++ b/abims_CAMERA_annotateDiffreport.xml	Thu Mar 01 08:04:16 2018 -0500
@@ -1,4 +1,4 @@
-<tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.0">
+<tool id="abims_CAMERA_annotateDiffreport" name="CAMERA.annotate" version="2.2.2">
 
     <description>CAMERA annotate function. Returns annotation results (isotope peaks, adducts and fragments) and a diffreport if more than one condition.</description>
 
@@ -424,6 +424,14 @@
 Changelog/News
 --------------
 
+**Version 2.2.2 - 01/03/2018**
+
+- UPGRADE: upgrate the CAMERA version from 1.26.0 to 1.32.0
+
+**Version 2.2.1 - 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.2.0 - 28/03/2017**
 
 - BUGFIX: the diffreport ids didn't convert the rt in minute as the other export
--- a/macros.xml	Wed Apr 05 11:27:56 2017 -0400
+++ b/macros.xml	Thu Mar 01 08:04:16 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 -->