commit e7e51ac5e6a2c61afab11d30d5dd034e66877734
author Monty Taylor <mordred@inaugust.com> Thu Jul 04 14:10:46 2013 -0400
committer Monty Taylor <mordred@inaugust.com> Thu Jul 04 16:09:46 2013 -0400
tree 2992cea31182d4a6a490d1d596b5d868eeabde02
parent 54c977a43becc39f47452962300942d34d3a561c

Directly install requirements with pip

Rather than parsing then feeding the pip requirements file to pip,
just have pip consume it directly.

Change-Id: I17bbe4324e6957c7165bc0f340ddae1e51039471

functions

diff --git a/functions b/functions
index 06d7e7b..fa0e724 100644
--- a/functions
+++ b/functions
@@ -1087,12 +1087,13 @@
     else
         SUDO_CMD="sudo"
     fi
+    for reqs_file in $1/requirements.txt $1/tools/pip-requires ; do
+        if [ -f $reqs_file ] ; then
+            pip_install -r $reqs_file
+        fi
+    done
     (cd $1; \
         python setup.py egg_info; \
-        raw_links=$(awk '/^.+/ {print "-f " $1}' *.egg-info/dependency_links.txt); \
-        depend_links=$(echo $raw_links | xargs); \
-        require_file=$([ ! -r *-info/requires.txt ] || echo "-r *-info/requires.txt"); \
-        pip_install $require_file $depend_links; \
         $SUDO_CMD \
             HTTP_PROXY=$http_proxy \
             HTTPS_PROXY=$https_proxy \