| Previous changeset 61:c1dba49b72ef (2014-05-28) Next changeset 63:fb823a59918f (2014-05-28) |
|
Commit message:
Undo including $ENV[PYTHONPATH] in PYTHONPATH If $ENV[PYTHONPATH] is empty, Galaxy replaces it with $PYTHONPATH instead of an empty string, which introduces python 2 code in the python 3 path. |
|
modified:
tool_dependencies.xml |
| b |
| diff -r c1dba49b72ef -r b90441d0fe7d tool_dependencies.xml --- a/tool_dependencies.xml Wed May 28 12:02:42 2014 +0200 +++ b/tool_dependencies.xml Wed May 28 14:02:38 2014 +0200 |
| [ |
| @@ -44,7 +44,7 @@ <action type="set_environment"> <!-- Remove any incoming PYTHONPATH elements from Galaxy's own environment --> - <environment_variable name="PYTHONPATH" action="set_to">$INSTALL_DIR/blast2html_venv/lib/python3.4/site-packages:$ENV[PYTHONPATH]</environment_variable> + <environment_variable name="PYTHONPATH" action="set_to">$INSTALL_DIR/blast2html_venv/lib/python3.4/site-packages</environment_variable> <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/blast2html_venv/bin</environment_variable> <environment_variable name="PYTHONHOME" action="set_to"></environment_variable> <!-- To find shared libraries such as libssl or libxml2 --> |