Mercurial > repos > lecorguille > xcms_group

changeset 19:7f667b64d5a5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/workflow4metabolomics/xcms commit b274c5c21db1a6ad63c28d425a7a6bce483a4af4
author lecorguille
date Fri, 10 Feb 2017 11:01:55 -0500
parents ab5093759cb3
children a79d839d625f
files README.rst abims_xcms_group.xml macros.xml
diffstat 3 files changed, 12 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/README.rst	Thu Feb 09 04:50:11 2017 -0500
+++ b/README.rst	Fri Feb 10 11:01:55 2017 -0500
@@ -2,12 +2,10 @@
 Changelog/News
 --------------
 
-**Version 2.1.1 - 07/02/2017**
+**Version 2.1.0 - 07/02/2017**
 
 - IMPROVEMENT: Add an option to export the peak list at this step without have to wait camara.annotate
 
-**Version 2.1.0 - 03/02/2017**
-
 - IMPROVEMENT: xcms.group can deal with merged individual data from "xcms.xcmsSet Merger"
 
 **Version 2.0.6 - 06/07/2016**
--- a/abims_xcms_group.xml	Thu Feb 09 04:50:11 2017 -0500
+++ b/abims_xcms_group.xml	Fri Feb 10 11:01:55 2017 -0500
@@ -1,4 +1,4 @@
-<tool id="abims_xcms_group" name="xcms.group" version="2.1.1">
+<tool id="abims_xcms_group" name="xcms.group" version="2.1.0">
 
     <description>Group peaks together across samples using overlapping m/z bins and calculation of smoothed peak distributions in chromatographic time.</description>
 
@@ -12,10 +12,10 @@
     <command><![CDATA[
         @COMMAND_XCMS_SCRIPT@
         xfunction group
-        image $image
+        image '$image'
 
-        xsetRdataOutput $xsetRData
-        rplotspdf $rplotsPdf
+        xsetRdataOutput '$xsetRData'
+        rplotspdf '$rplotsPdf'
 
         method $methods.method sleep 0.001
         #if $methods.method == "density":
@@ -413,12 +413,10 @@
 Changelog/News
 --------------
 
-**Version 2.1.1 - 07/02/2017**
+**Version 2.1.0 - 07/02/2017**
 
 - IMPROVEMENT: Add an option to export the peak list at this step without have to wait camara.annotate
 
-**Version 2.1.0 - 03/02/2017**
-
 - IMPROVEMENT: xcms.group can deal with merged individual data from "xcms.xcmsSet Merger"
 
 **Version 2.0.6 - 06/07/2016**
--- a/macros.xml	Thu Feb 09 04:50:11 2017 -0500
+++ b/macros.xml	Fri Feb 10 11:01:55 2017 -0500
@@ -25,8 +25,8 @@
     <token name="@COMMAND_LOG_EXIT@">
         ;
         return=\$?;
-        mv log.txt $log;
-        cat $log;
+        mv log.txt '$log';
+        cat '$log';
         sh -c "exit \$return"
     </token>
 
@@ -35,12 +35,12 @@
     <token name="@COMMAND_FILE_LOAD@">
         #if $file_load_conditional.file_load_select == "yes":
             #if $file_load_conditional.inputs.input == "zip_file":
-                zipfile $file_load_conditional.inputs.zip_file
+                zipfile '$file_load_conditional.inputs.zip_file'
             #else
                 #set singlefile_galaxyPath = ','.join( [ str( $single_file ) for $single_file in $file_load_conditional.inputs.single_file ] )
                 #set singlefile_sampleName = ','.join( [ str( $single_file.name ) for $single_file in $file_load_conditional.inputs.single_file ] )
 
-                singlefile_galaxyPath $singlefile_galaxyPath singlefile_sampleName $singlefile_sampleName
+                singlefile_galaxyPath '$singlefile_galaxyPath' singlefile_sampleName '$singlefile_sampleName'
             #end if
         #end if
     </token>
@@ -72,8 +72,8 @@
 
     <token name="@COMMAND_PEAKLIST@">
         #if $peaklist.peaklistBool
-            variableMetadataOutput $variableMetadata
-            dataMatrixOutput $dataMatrix
+            variableMetadataOutput '$variableMetadata'
+            dataMatrixOutput '$dataMatrix'
             convertRTMinute $peaklist.convertRTMinute
             numDigitsMZ $peaklist.numDigitsMZ
             numDigitsRT $peaklist.numDigitsRT