Mercurial > repos > workflow4metabolomics > camera_combinexsannos

changeset 2:c4c13745e797 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload commit f978cc0a7aa81c244591e560f44970f0d61bf74e"
author workflow4metabolomics
date Sat, 28 Mar 2020 10:41:07 -0400
parents ea15115a5b3f
children 3bf04fc404d9
files README.rst abims_CAMERA_combinexsAnnos.xml lib.r macros.xml
diffstat 4 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/README.rst	Thu Feb 13 17:23:27 2020 -0500
+++ b/README.rst	Sat Mar 28 10:41:07 2020 -0400
@@ -2,6 +2,10 @@
 Changelog/News
 --------------
 
+**Version 2.2.6+camera1.42.0** - 13/02/2020
+
+UPGRADE: upgrade the CAMERA version from 1.38.1 to 1.42.0 (see CAMERA News_)
+
 **Version 2.2.5 - 09/04/2019**
 
 - UPGRADE: upgrade the CAMERA version from 1.34.0 to 1.38.1 (see CAMERA News_)
--- a/abims_CAMERA_combinexsAnnos.xml	Thu Feb 13 17:23:27 2020 -0500
+++ b/abims_CAMERA_combinexsAnnos.xml	Sat Mar 28 10:41:07 2020 -0400
@@ -1,4 +1,4 @@
-<tool id="abims_CAMERA_combinexsAnnos" name="CAMERA.combinexsAnnos" version="2.2.5+camera@TOOL_VERSION@+galaxy0">
+<tool id="abims_CAMERA_combinexsAnnos" name="CAMERA.combinexsAnnos" version="2.2.6+camera@TOOL_VERSION@+galaxy0">
 
     <description>Wrapper function for the combinexsAnnos CAMERA function. Returns a dataframe with recalculated annotations.</description>
 
--- a/lib.r	Thu Feb 13 17:23:27 2020 -0500
+++ b/lib.r	Sat Mar 28 10:41:07 2020 -0400
@@ -187,12 +187,12 @@
                     if (args$eicmax != 0) {
                         if (args$png2 == "pdf")
                             diffreport_png2pdf(filebase)
+                        if (args$png2 == "zip")
+                            diffreport_png2zip()
                     }
                 }
             }
         }
-        if (args$png2 == "zip")
-            diffreport_png2zip()
         if (args$tabular2 == "zip")
             diffreport_tabular2zip()
     }
--- a/macros.xml	Thu Feb 13 17:23:27 2020 -0500
+++ b/macros.xml	Sat Mar 28 10:41:07 2020 -0400
@@ -161,9 +161,9 @@
     </token>
 
     <token name="@HELP_CAMERA_NEWVERSION_1420@">
-**Version 2.2.5+camera1.42.0 - 13/02/2020**
+**Version 2.2.6+camera1.42.0 - 13/02/2020**
 
-- UPGRADE: upgrade the xcms version from 3.0.0 to 1.42.0 (see CAMERA News_)
+- UPGRADE: upgrade the CAMERA version from 1.38.0 to 1.42.0 (see CAMERA News_)
     </token>
 
     <xml name="citation">