From e7e51ac5e6a2c61afab11d30d5dd034e66877734 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 4 Jul 2013 14:10:46 -0400
Subject: [PATCH] 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 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/functions b/functions
index 06d7e7b38b..fa0e7248da 100644
--- a/functions
+++ b/functions
@@ -1087,12 +1087,13 @@ function setup_develop() {
     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 \