changeset 3:16add262be4e draft

Uploaded
author bgruening
date Sun, 29 Jun 2014 10:50:35 -0400
parents c3b5cd4e5ce4
children 806c9d0a5321
files tool_dependencies.xml
diffstat 1 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Jun 27 20:16:32 2014 -0400
+++ b/tool_dependencies.xml	Sun Jun 29 10:50:35 2014 -0400
@@ -66,23 +66,22 @@
 
         <action type="autoconf" />
 
-        <action type="download_file">https://bootstrap.pypa.io/get-pip.py</action>
-        <action type="move_file">
-            <source>get-pip.py</source>
-            <destination>$INSTALL_DIR/bin/pip</destination>
-        </action>
-        <action type="chmod">
-            <file mode="750">$INSTALL_DIR/bin/pip</file>
-        </action>
+        <action type="download_file">https://bitbucket.org/pypa/setuptools/get/5.2.tar.bz2</action>
+        <action type="change_directory">..</action>
+        <action type="shell_command">tar -xjf 5.2.tar.bz2</action>
+        <action type="change_directory">pypa-setuptools-f493e6c4ffd8</action>
+
+        <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python2.7/site-packages/ &amp;&amp; python setup.py install --prefix=$INSTALL_DIR</action>
 
         <action type="set_environment">
           <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+          <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/pip/bin</environment_variable>
           <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$ENV[LD_LIBRARY_PATH]</environment_variable>
-          <!-- clear 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>
+          <environment_variable action="set_to" name="PYTHONPATH">$INSTALL_DIR/lib/python2.7</environment_variable>
+          <environment_variable action="set_to" name="PYTHON_HOME">$INSTALL_DIR</environment_variable>
           <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
         </action>
+
       </actions>
     </install>