From bcde23db6562d951e852088ab5202e27764ce99f Mon Sep 17 00:00:00 2001
From: Alan Cutter <alancutter@chromium.org>
Date: Tue, 27 May 2014 11:34:18 +1000
Subject: [PATCH 1/2] Explicitly allow PIL to be installed from external
 sources.

---
 tools/python/requirements.txt | 2 ++
 tools/python/setup.sh         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/tools/python/requirements.txt b/tools/python/requirements.txt
index dd35945f..544c7b5e 100644
--- a/tools/python/requirements.txt
+++ b/tools/python/requirements.txt
@@ -7,4 +7,6 @@ selenium
 # Requirements for using -x
 pyvirtualdisplay
 pyscreenshot
+--allow-external=PIL
+--allow-unverified=PIL
 PIL
diff --git a/tools/python/setup.sh b/tools/python/setup.sh
index d2b6edc0..61d6172b 100755
--- a/tools/python/setup.sh
+++ b/tools/python/setup.sh
@@ -29,6 +29,10 @@ EOF
 
   if virtualenv --system-site-packages .; then
     echo -e;
+    (
+      source bin/activate
+      pip install --upgrade pip
+    )
   else
    cat <<EOF
 Was unable to set up the virtualenv environment. Please see output for errors.

From 4e496ed2ec2038e9e611f5b9f00600993eab68a9 Mon Sep 17 00:00:00 2001
From: Alan Cutter <alancutter@chromium.org>
Date: Tue, 3 Jun 2014 20:13:02 +1000
Subject: [PATCH 2/2] Make sure pip version is able to support external sources

---
 tools/python/setup.sh | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tools/python/setup.sh b/tools/python/setup.sh
index 61d6172b..37de0328 100755
--- a/tools/python/setup.sh
+++ b/tools/python/setup.sh
@@ -29,10 +29,6 @@ EOF
 
   if virtualenv --system-site-packages .; then
     echo -e;
-    (
-      source bin/activate
-      pip install --upgrade pip
-    )
   else
    cat <<EOF
 Was unable to set up the virtualenv environment. Please see output for errors.
@@ -43,17 +39,22 @@ fi
 
 source bin/activate
 
-# Check if the dependencies are installed
-pip install --no-download -r requirements.txt > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-  # Install dependencies
-  pip install -r requirements.txt --upgrade
+function ensureRequirementsMet() {
+  # Check if installed
+  pip install --no-download $@ > /dev/null 2>&1
   if [ $? -ne 0 ]; then
-    cat <<EOF
-Unable to install the required dependencies. Please see error output above.
+    # Install dependencies
+    pip install --upgrade $@
+    if [ $? -ne 0 ]; then
+      cat <<EOF
+Unable to install dependencies. Please see error output above.
 EOF
-    exit 1
+      exit 1
+    fi
   fi
-fi
+}
+
+ensureRequirementsMet 'pip>=1.5'
+ensureRequirementsMet -r requirements.txt
 
 cd $OLD_PWD