changeset 8:57f8e8df6f2a

ChemicalToolBoX update.
author Bjoern Gruening <bjoern.gruening@gmail.com>
date Tue, 23 Jul 2013 00:52:29 +0200
parents e1a5e214c51c
children cd2e7872a8eb
files tool_dependencies.xml
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Jul 22 18:38:35 2013 +0200
+++ b/tool_dependencies.xml	Tue Jul 23 00:52:29 2013 +0200
@@ -7,7 +7,7 @@
             <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="62fda117ad4a" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+            <repository changeset_revision="a0f0a86440ca" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
         </package>
         <package name="scipy" version="0.12.0">
             <install version="1.0">
@@ -20,25 +20,25 @@
                         <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                             <package name="lapack" version="3.4.2" />
                         </repository>
-                        <repository changeset_revision="62fda117ad4a" name="package_numpy_1_7" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                        <repository changeset_revision="a0f0a86440ca" name="package_numpy_1_7" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                             <package name="numpy" version="1.7.1" />
                         </repository>
                     </action>
                     <action type="make_directory">$INSTALL_DIR/lib/python</action>
                     <action language="cheetah" type="template_command">
-                    export PYTHONPATH=\$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
+                    export PYTHONPATH=\$PYTHONPATH:$env.INSTALL_DIR/lib/python &amp;&amp; 
 
                     #if env.get('ATLAS_LIB_DIR', False):
-                        export ATLAS=$ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
+                        export ATLAS=$env.ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
                     #end if
                     #if env.get('LAPACK_LIB_DIR', False):
-                        export BLAS=$LAPACK_LIB_DIR/libblas.a &amp;&amp; 
-                        export LAPACK=$LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
+                        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:$PATH_NUMPY &amp;&amp; 
-                    export PYTHONPATH=\$PYTHONPATH:$PYTHONPATH_NUMPY &amp;&amp; 
-                    python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin
+                    export PATH=\$PATH:$env.PATH_NUMPY &amp;&amp; 
+                    export PYTHONPATH=\$PYTHONPATH:$env.PYTHONPATH_NUMPY &amp;&amp; 
+                    python setup.py install --home $env.INSTALL_DIR --install-scripts $env.INSTALL_DIR/bin
                     </action>
                     <action type="set_environment">
                         <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>