| Previous changeset 4:dd91d64330d4 (2015-01-27) Next changeset 6:287f4e1318e5 (2015-05-17) |
|
Commit message:
Uploaded |
|
modified:
tool_dependencies.xml |
| b |
| diff -r dd91d64330d4 -r 266529386609 tool_dependencies.xml --- a/tool_dependencies.xml Tue Jan 27 15:14:46 2015 -0500 +++ b/tool_dependencies.xml Wed Feb 11 12:02:29 2015 -0500 |
| b |
| @@ -3,26 +3,24 @@ <package name="atlas" version="3.10.2"> <repository changeset_revision="d5b1c7875b7b" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" /> </package> - <package name="python" version="2.7"> - <repository changeset_revision="2c52c900e56a" name="package_python_2_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" /> - </package> <package name="numpy" version="1.9"> <install version="1.0"> <actions> + <action type="download_by_url">https://pypi.python.org/packages/source/n/numpy/numpy-1.9.0.tar.gz#md5=510cee1c6a131e0a9eb759aa2cc62609</action> + <action type="make_directory">$INSTALL_DIR/lib/python</action> <action type="set_environment_for_install"> <repository changeset_revision="d5b1c7875b7b" name="package_atlas_3_10" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu"> <package name="atlas" version="3.10.2" /> </repository> </action> - <action type="setup_python_environment"> - <repository changeset_revision="2c52c900e56a" 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://pypi.python.org/packages/source/n/numpy/numpy-1.9.1.tar.gz</package> + <action type="shell_command"> + export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && + export ATLAS=$ATLAS_ROOT_PATH && + python setup.py install --install-lib $INSTALL_DIR/lib/python --install-scripts $INSTALL_DIR/bin </action> <action type="set_environment"> - <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR</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="set_to" name="PYTHONPATH_NUMPY">$INSTALL_DIR/lib/python</environment_variable> <environment_variable action="set_to" name="PATH_NUMPY">$INSTALL_DIR/bin</environment_variable> </action> |