# HG changeset patch
# User iuc
# Date 1422003277 18000
# Node ID 6424ce261dab677f44f806d9eb4c3200b874a862
# Parent  9aa9fd9e3e32218aaece0efafa145e51e9c59e14
Uploaded

diff -r 9aa9fd9e3e32 -r 6424ce261dab tool_dependencies.xml
--- a/tool_dependencies.xml	Wed Jan 21 17:25:03 2015 -0500
+++ b/tool_dependencies.xml	Fri Jan 23 03:54:37 2015 -0500
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="numpy" version="1.9">
-       <repository changeset_revision="49a8bba001d7" name="package_numpy_1_9" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+       <repository changeset_revision="5bd85e0058d6" name="package_numpy_1_9" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.5.2">
         <repository changeset_revision="34ebf47e4941" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
@@ -12,17 +12,18 @@
         <package name="zlib" version="1.2.8">
         <repository changeset_revision="03abe628fbe8" name="package_zlib_1_2_8" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
+    <package name="python" version="2.7">
+        <repository changeset_revision="dffe84445ebd" name="package_python_2_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
     <package name="matplotlib" version="1.4">
         <install version="1.0">
             <actions>
-                <!-- first action is always downloading -->
-                <action type="download_by_url">https://github.com/matplotlib/matplotlib/archive/v1.4.2.zip</action>
                 <!-- populate the environment variables from the dependend repos -->
                 <action type="set_environment_for_install">
                    <repository changeset_revision="03abe628fbe8" name="package_zlib_1_2_8" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="zlib" version="1.2.8" />
                     </repository>
-                    <repository changeset_revision="49a8bba001d7" name="package_numpy_1_9" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="5bd85e0058d6" name="package_numpy_1_9" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="numpy" version="1.9" />
                     </repository>
                     <repository changeset_revision="34ebf47e4941" name="package_freetype_2_5_2" owner="devteam" toolshed="https://testtoolshed.g2.bx.psu.edu">
@@ -32,12 +33,12 @@
                         <package name="libpng" version="1.6.7" />
                     </repository>
                 </action>
-
-                <!-- install matplotlib -->
-                <action type="make_directory">$INSTALL_DIR/lib/python</action>
-                <action type="shell_command">
-                    export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp;
-                    python setup.py install --install-lib $INSTALL_DIR/lib/python --install-scripts $INSTALL_DIR/bin
+                <action type="setup_python_environment">
+                   <repository changeset_revision="dffe84445ebd" name="package_python_2_7" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                       <package name="python" version="2.7" />
+                   </repository>
+                    <!-- allow downloading and installing an Python package from https://pypi.org/ -->
+                    <package>https://github.com/matplotlib/matplotlib/archive/v1.4.2.zip</package>
                 </action>
                 <action type="set_environment">
                     <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>