diff 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
line wrap: on
line diff
--- 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 -->