# HG changeset patch
# User bgruening
# Date 1366064500 14400
# Node ID c3041382815c0f338d1808980323fe2d81b0e7d8
# Parent  c5fbe4aa5a74370726f71f7ae770365750c255bf
Uploaded

diff -r c5fbe4aa5a74 -r c3041382815c tool_dependencies.xml
--- a/tool_dependencies.xml	Fri Apr 12 13:45:15 2013 -0400
+++ b/tool_dependencies.xml	Mon Apr 15 18:21:40 2013 -0400
@@ -1,29 +1,16 @@
 <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="c5f0d2504e45" />
-    </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="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; 
-                    ./configure --prefix=$INSTALL_DIR/freetype/build &amp;&amp;
-                    make &amp;&amp; 
-                    make install</action>
+                <action type="download_by_url">https://pypi.python.org/packages/source/n/numpy/numpy-1.7.1.tar.gz</action>
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
-                <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
-                    export CPLUS_INCLUDE_PATH=$INSTALL_DIR/freetype/build/include:$INSTALL_DIR/freetype/build/include/freetype2/ &amp;&amp; 
-                    export LIBRARY_PATH=$INSTALL_DIR/freetype/build/lib/ &amp;&amp; 
-                    python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+                <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
                 <action type="set_environment">
                     <environment_variable name="PYTHONPATH" action="append_to">$INSTALL_DIR/lib/python</environment_variable>
+                    <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
                 </action>
             </actions>
         </install>
-        <readme>Compiling matplotlib requires a Ccompiler (typically gcc), freetype2, numpy and libpng.</readme>
+        <readme>Compiling numpy requires a C and Fortran compiler (typically gcc and gfortran).</readme>
     </package>
 </tool_dependency>