changeset 2:73fbfe731815 draft default tip

Uploaded
author bgruening
date Sat, 15 Mar 2014 05:14:05 -0400
parents 0f560efd398f
children
files tool_dependencies.xml
diffstat 1 files changed, 11 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Aug 09 13:26:47 2013 -0400
+++ b/tool_dependencies.xml	Sat Mar 15 05:14:05 2014 -0400
@@ -1,39 +1,29 @@
 <?xml version="1.0"?>
 <tool_dependency>
-        <package name="lapack" version="3.4.2">
-            <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
-        </package>
-        <package name="atlas" version="3.10.1">
-            <repository changeset_revision="68df9078bf69" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
-        </package>
         <package name="numpy" version="1.7.1">
-            <repository changeset_revision="40db34c904df" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="84125ffacb90" name="package_numpy_1_7" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
         <package name="scipy" version="0.12.0">
-            <repository changeset_revision="cd2e7872a8eb" name="package_scipy_0_12" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="4b2ef8519550" name="package_scipy_0_12" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
         <package name="matplotlib" version="1.2.1">
-            <repository changeset_revision="dd81b71dff1b" name="package_matplotlib_1_2" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+            <repository changeset_revision="85b7ddf90888" name="package_matplotlib_1_2" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
         </package>
-
         <package name="scikit_learn" version="0.14.1">
             <install version="1.0">
                 <actions>
                     <action type="download_by_url">https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.14.1.tar.gz</action>
                     <action type="set_environment_for_install">
-                        <repository changeset_revision="68df9078bf69" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
-                            <package name="atlas" version="3.10.1" />
-                        </repository>
-                        <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="73854db866e7" name="package_lapack_3_4" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="lapack" version="3.4.2" />
                         </repository>
-                        <repository changeset_revision="40db34c904df" name="package_numpy_1_7" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="84125ffacb90" name="package_numpy_1_7" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="numpy" version="1.7.1" />
                         </repository>
-                        <repository changeset_revision="cd2e7872a8eb" name="package_scipy_0_12" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="4b2ef8519550" name="package_scipy_0_12" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="scipy" version="0.12.0" />
                         </repository>
-                        <repository changeset_revision="dd81b71dff1b" name="package_matplotlib_1_2" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                        <repository changeset_revision="85b7ddf90888" name="package_matplotlib_1_2" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                             <package name="matplotlib" version="1.2.1" />
                         </repository>
                     </action>
@@ -42,27 +32,19 @@
                     <action language="cheetah" type="template_command">
                     export PYTHONPATH=\$PYTHONPATH:$env.INSTALL_DIR/lib/python &amp;&amp; 
 
-                    #if env.get('ATLAS_LIB_DIR', False):
-                        export ATLAS=$env.ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
-                    #end if
-                    #if env.get('LAPACK_LIB_DIR', False):
-                        export BLAS=$env.LAPACK_LIB_DIR/libblas.a &amp;&amp; 
-                        export LAPACK=$env.LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
-                    #end if
-
                     export PATH=\$PATH:$env.PATH_NUMPY &amp;&amp; 
                     export PYTHONPATH=\$PYTHONPATH:$env.PYTHONPATH_NUMPY:$env.PYTHONPATH_SCIPY:$env.PYTHONPATH_MATPLOTLIB &amp;&amp;
 
                     python setup.py install --install-lib $env.INSTALL_DIR/lib/python
                     </action>
                     <action type="set_environment">
-                        <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
+                        <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
                         <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                        <environment_variable action="append_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable>
+                        <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable>
                         <environment_variable action="prepend_to" name="PATH">$ENV[PATH_NUMPY]</environment_variable>
-                        <environment_variable action="append_to" name="PYTHONPATH">$ENV[PYTHONPATH_SCIPY]</environment_variable>
+                        <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_SCIPY]</environment_variable>
                         <environment_variable action="prepend_to" name="PATH">$ENV[PATH_SCIPY]</environment_variable>
-                        <environment_variable action="append_to" name="PYTHONPATH">$ENV[PYTHONPATH_MATPLOTLIB]</environment_variable>
+                        <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_MATPLOTLIB]</environment_variable>
 
                         <environment_variable action="set_to" name="PYTHONPATH_SCIKIT_LEARN">$INSTALL_DIR/lib/python</environment_variable>
                         </action>