diff tool_dependencies.xml @ 7:26cc4c64292b

Uploaded

--- a/tool_dependencies.xml	Thu Apr 18 10:30:43 2013 -0400
+++ b/tool_dependencies.xml	Wed Apr 24 15:21:23 2013 -0400
@@ -1,13 +1,13 @@
 <tool_dependency>
-    <!-- ToDo: numpy dependency, install numpy beforehand. 
-    -->
-    <package name="numpy" version="1.7.1">
-	<repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_numpy_1_7" owner="bgruening" changeset_revision="c3041382815c" prior_installation_required="True" />
-    </package>
     <package name="matplotlib" version="1.2.1">
         <install version="1.0">
             <actions>
-                <action type="download_by_url">https://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-1.2.1/matplotlib-1.2.1.tar.gz</action>
+                <action type="download_by_url">http://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-1.2.1/matplotlib-1.2.1.tar.gz</action>
+                <action type="set_environmnet_for_install">
+                    <package name="numpy" version="1.7.1">
+                        <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_numpy_1_7" owner="bgruening" changeset_revision="c3041382815c" />
+                    </package>
+                </action>
                 <action type="shell_command">wget http://downloads.sourceforge.net/project/freetype/freetype2/2.4.11/freetype-2.4.11.tar.bz2</action>
                 <action type="shell_command">tar xfvj freetype-2.4.11.tar.bz2 &amp;&amp; 
                     cd freetype-2.4.11 &amp;&amp; 
@@ -24,6 +24,6 @@
                 </action>
             </actions>
         </install>
-        <readme>Compiling matplotlib requires a C compiler (typically gcc), freetype2, numpy and libpng.</readme>
+        <readme>Compiling matplotlib requires a C compiler (typically gcc) and libpng.</readme>
     </package>
 </tool_dependency>