| Previous changeset 0:e9407b729a69 (2014-05-22) Next changeset 2:ab42c5133d1c (2014-05-22) |
|
Commit message:
Fix some whitespace |
|
modified:
tool_dependencies.xml |
| b |
| diff -r e9407b729a69 -r 09faf0ae581b tool_dependencies.xml --- a/tool_dependencies.xml Thu May 22 05:58:18 2014 -0400 +++ b/tool_dependencies.xml Thu May 22 06:00:27 2014 -0400 |
| b |
| @@ -7,19 +7,19 @@ <package name="python3" version="3.4.1"> <install version="1.0"> <actions> - <action type="download_by_url">https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz</action> + <action type="download_by_url">https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz</action> <action type="set_environment_for_install"> <repository changeset_revision="e459a9ce3fce" name="package_openssl" owner="jankanis" toolshed="http://toolshed.g2.bx.psu.edu"> <package name="openssl" version="1.0.1g" /> </repository> </action> - <action type="autoconf">--prefix=$INSTALL_DIR</action> - <action type="set_environment"> - <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> - <!-- empty PYTHONPATH, otherwise we will get Galaxy's Python 2 libraries in the Python 3 path--> - <environment_variable action="set_to" name="PYTHONPATH" /> - <environment_variable action="set_to" name="PYTHONHOME">$INSTALL_DIR</environment_variable> - </action> + <action type="autoconf">--prefix=$INSTALL_DIR</action> + <action type="set_environment"> + <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> + <!-- empty PYTHONPATH, otherwise we will get Galaxy's Python 2 libraries in the Python 3 path--> + <environment_variable action="set_to" name="PYTHONPATH" /> + <environment_variable action="set_to" name="PYTHONHOME">$INSTALL_DIR</environment_variable> + </action> </actions> </install> @@ -29,21 +29,21 @@ Python as of version 3.3 includes a built-in virtual environment manager. To create a python 3 virtual env, include the following actions in your tool_dependencies.xml: <action type="set_environment_for_install"> - <repository name="python3" owner="jankanis"> + <repository name="python3" owner="jankanis"> <package name="python3" version="3.4.1" /> - </repository> + </repository> </action> <action type="shell_command"> - # Unset any saved environment settings from parent virtual - # environments, e.g. for python 2 or if Galaxy itself is running - # from within a virtual environment. - unset _OLD_VIRTUAL_PATH; unset _OLD_VIRTUAL_PYTHONHOME - pyvenv {{$MY_PACKAGE_NAME}} - . {{$MY_PACKAGE_NAME}}/bin/activate - pip install {{$PYTHON-PACKAGE}} + # Unset any saved environment settings from parent virtual + # environments, e.g. for python 2 or if Galaxy itself is running + # from within a virtual environment. + unset _OLD_VIRTUAL_PATH; unset _OLD_VIRTUAL_PYTHONHOME + pyvenv {{$MY_PACKAGE_NAME}} + . {{$MY_PACKAGE_NAME}}/bin/activate + pip install {{$PYTHON-PACKAGE}} </action> <action type="set_environment"> - <environment_variable name="PYTHONPATH" action="prepend_to">$INSTALL_DIR/lib/python3.4/site-packages:$INSTALL_DIR/lib64/python3.4/iste-packages</environment_variable> + <environment_variable name="PYTHONPATH" action="prepend_to">$INSTALL_DIR/lib/python3.4/site-packages:$INSTALL_DIR/lib64/python3.4/iste-packages</environment_variable> </action> </readme> |