Mercurial > repos > bgruening > package_numpy_1_7
changeset 20:62fda117ad4a
ChemicalToolBoX update.
| author | Bjoern Gruening <bjoern.gruening@gmail.com> |
|---|---|
| date | Mon, 22 Jul 2013 17:05:05 +0200 |
| parents | ad6ebe2c75ef |
| children | a0f0a86440ca |
| files | tool_dependencies.xml |
| diffstat | 1 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tool_dependencies.xml Wed May 29 17:05:16 2013 +0200 +++ b/tool_dependencies.xml Mon Jul 22 17:05:05 2013 +0200 @@ -4,14 +4,14 @@ <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="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" /> + <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"> <install version="1.0"> <actions> <action type="download_by_url">https://pypi.python.org/packages/source/n/numpy/numpy-1.7.1.tar.gz</action> <action type="set_environment_for_install"> - <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/"> + <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/"> @@ -19,11 +19,18 @@ </repository> </action> <action type="make_directory">$INSTALL_DIR/lib/python</action> - <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && - export BLAS=$LAPACK_LIB_DIR/libblas.a && - export LAPACK=$LAPACK_LIB_DIR/liblapack.a && - export ATLAS=$ATLAS_LIB_DIR/libatlas.a && - python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action> + <action language="cheetah" type="template_command"> + export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && + + #if env.get('ATLAS_LIB_DIR', False): + export ATLAS=$ATLAS_LIB_DIR/libatlas.a && + #end if + #if env.get('LAPACK_LIB_DIR', False): + export BLAS=$LAPACK_LIB_DIR/libblas.a && + export LAPACK=$LAPACK_LIB_DIR/liblapack.a && + #end if + python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin + </action> <action type="set_environment"> <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable> <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> @@ -32,6 +39,6 @@ </action> </actions> </install> - <readme>Compiling numpy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for numpy can be accessed through PYTHONPATH_NUMPYand the binaries with PATH_NUMPY.</readme> + <readme>Compiling numpy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for numpy can be accessed through PYTHONPATH_NUMPY and the binaries with PATH_NUMPY.</readme> </package> </tool_dependency> \ No newline at end of file