Mercurial > repos > saskia-hiltemann > testrepo

changeset 1:1e7227087237 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author saskia-hiltemann
date Thu, 29 Oct 2015 11:17:43 -0400
parents 8cdada007b82
children 00edf99d4306
files tool_dependencies.xml tool_dependencies.xml~ xy_plot.xml
diffstat 3 files changed, 5 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu Oct 29 10:51:23 2015 -0400
+++ b/tool_dependencies.xml	Thu Oct 29 11:17:43 2015 -0400
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="R" version="2.11.0">
-        <repository changeset_revision="5824d2b3bc8b" name="package_r_2_11_0" owner="devteam" toolshed="https://toolshed.g2.bx.psu.edu" />
-    </package>
-    <package name="cairo" version="1.14.2">
-        <repository changeset_revision="931dda69e1b0" name="package_cairo_1_14_2" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu" />
+    <package name="R" version="3.2.1">
+        <repository changeset_revision="e46a7803f17b" name="package_r_3_2_1" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu" />
     </package>
 </tool_dependency>
--- a/tool_dependencies.xml~	Thu Oct 29 10:51:23 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<tool_dependency>
-    <package name="R" version="2.11.0">
-        <repository changeset_revision="5824d2b3bc8b" name="package_r_2_11_0" owner="devteam" toolshed="https://toolshed.g2.bx.psu.edu" />
-    </package>
-</tool_dependency>
--- a/xy_plot.xml	Thu Oct 29 10:51:23 2015 -0400
+++ b/xy_plot.xml	Thu Oct 29 11:17:43 2015 -0400
@@ -1,9 +1,8 @@
 <tool id="XY_Plot_1" name="Plotting tool" version="1.0.1">
   <description>for multiple series and graph types</description>
   <requirements>
-    <requirement type="package" version="2.11.0">R</requirement>
-    <requirement type="package" version="1.14.2">cairo</requirement>
-  </requirements>
+    <requirement type="package" version="3.2.1">R</requirement>
+   </requirements>
   <command interpreter="bash">r_wrapper.sh $script_file</command>
 
   <inputs>
@@ -79,7 +78,7 @@
         yrange = range( y${i}, yrange )
       #end for
       ## Open output PDF file
-      png( "${out_file1}" )
+      pngcairo( "${out_file1}" )
       ## Dummy plot for axis / labels
       plot( NULL, type="n", xlim=xrange, ylim=yrange, main="${main}", xlab="${xlab}", ylab="${ylab}" )
       ## Plot each series