comparison tool_dependencies.xml @ 62:b90441d0fe7d

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.
author Jan Kanis <jan.code@jankanis.nl>
date Wed, 28 May 2014 14:02:38 +0200
parents cd31e2fb5f22
children fb823a59918f
comparison
equal deleted inserted replaced
61:c1dba49b72ef 62:b90441d0fe7d
42 blast2html_venv/bin/pip3 install lxml jinja2 42 blast2html_venv/bin/pip3 install lxml jinja2
43 </action> 43 </action>
44 44
45 <action type="set_environment"> 45 <action type="set_environment">
46 <!-- Remove any incoming PYTHONPATH elements from Galaxy's own environment --> 46 <!-- Remove any incoming PYTHONPATH elements from Galaxy's own environment -->
47 <environment_variable name="PYTHONPATH" action="set_to">$INSTALL_DIR/blast2html_venv/lib/python3.4/site-packages:$ENV[PYTHONPATH]</environment_variable> 47 <environment_variable name="PYTHONPATH" action="set_to">$INSTALL_DIR/blast2html_venv/lib/python3.4/site-packages</environment_variable>
48 <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/blast2html_venv/bin</environment_variable> 48 <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/blast2html_venv/bin</environment_variable>
49 <environment_variable name="PYTHONHOME" action="set_to"></environment_variable> 49 <environment_variable name="PYTHONHOME" action="set_to"></environment_variable>
50 <!-- To find shared libraries such as libssl or libxml2 --> 50 <!-- To find shared libraries such as libssl or libxml2 -->
51 <environment_variable name="LD_LIBRARY_PATH" action="prepend_to">$ENV[LD_LIBRARY_PATH]</environment_variable> 51 <environment_variable name="LD_LIBRARY_PATH" action="prepend_to">$ENV[LD_LIBRARY_PATH]</environment_variable>
52 </action> 52 </action>