| Previous changeset 0:36b2ca3477c2 (2014-10-09) Next changeset 2:8c7bce1c6e30 (2015-07-17) |
|
Commit message:
Uploaded |
|
modified:
tool_dependencies.xml |
| b |
| diff -r 36b2ca3477c2 -r d470054f3a5d tool_dependencies.xml --- a/tool_dependencies.xml Thu Oct 09 05:20:54 2014 -0400 +++ b/tool_dependencies.xml Thu Feb 12 10:38:24 2015 -0500 |
| [ |
| @@ -1,34 +1,39 @@ <?xml version="1.0"?> <tool_dependency> - <package name="numpy" version="1.9"> - <repository changeset_revision="03eea94e534e" name="package_numpy_1_9" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> - </package> - <package name="scipy" version="0.14"> - <install version="1.0"> - <actions> - <action type="download_by_url">https://pypi.python.org/packages/source/s/scipy/scipy-0.14.0.tar.gz#md5=d7c7f4ccf8b07b08d6fe49d5cd51f85d</action> - <action type="set_environment_for_install"> - <repository changeset_revision="03eea94e534e" name="package_numpy_1_9" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu"> - <package name="numpy" version="1.9" /> - </repository> - </action> - <action type="make_directory">$INSTALL_DIR/lib/python</action> - <action type="shell_command"> + <package name="atlas" version="3.10.2"> + <repository changeset_revision="597c0e54eded" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> + </package> + <package name="numpy" version="1.9"> + <repository changeset_revision="84e97f5cd3ab" name="package_numpy_1_9" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> + </package> + <package name="scipy" version="0.14"> + <install version="1.0"> + <actions> + <action type="download_by_url">https://pypi.python.org/packages/source/s/scipy/scipy-0.14.0.tar.gz#md5=d7c7f4ccf8b07b08d6fe49d5cd51f85d</action> + <action type="set_environment_for_install"> + <repository changeset_revision="597c0e54eded" name="package_atlas_3_10" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu"> + <package name="atlas" version="3.10.2" /> + </repository> + <repository changeset_revision="84e97f5cd3ab" name="package_numpy_1_9" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu"> + <package name="numpy" version="1.9" /> + </repository> + </action> + <action type="make_directory">$INSTALL_DIR/lib/python</action> + <action type="shell_command"> export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && - export PATH=$PATH:$PATH_NUMPY && - export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_NUMPY && + 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/lib/python</environment_variable> - <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</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="set_to" name="PYTHONPATH_SCIPY">$INSTALL_DIR/lib/python</environment_variable> - <environment_variable action="set_to" name="PATH_SCIPY">$INSTALL_DIR/bin</environment_variable> - </action> - </actions> - </install> - <readme>Compiling scipy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for scipy can be accessed through PYTHONPATH_SCIPY and the binaries with PATH_SCIPY.</readme> - </package> + <action type="set_environment"> + <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="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable> + <environment_variable action="prepend_to" name="PATH">$ENV[PATH_NUMPY]</environment_variable> + <environment_variable action="set_to" name="PYTHONPATH_SCIPY">$INSTALL_DIR/lib/python</environment_variable> + <environment_variable action="set_to" name="PATH_SCIPY">$INSTALL_DIR/bin</environment_variable> + </action> + </actions> + </install> + <readme>Compiling scipy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for scipy can be accessed through PYTHONPATH_SCIPY and the binaries with PATH_SCIPY.</readme> + </package> </tool_dependency> |