From 20bf07a65e23e927ef93b6cb4aa6f0d0dc5d0536 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 21 Jan 2016 12:02:18 -0700 Subject: [PATCH] Always upgrade pip and setuptools Signed-off-by: Zack Cerza --- bootstrap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap b/bootstrap index 3eafcae68a..f4a3997140 100755 --- a/bootstrap +++ b/bootstrap @@ -109,12 +109,12 @@ if [ -z "$NO_CLOBBER" ] || [ ! -e ./virtualenv ]; then pip install virtualenv fi virtualenv --setuptools virtualenv +fi - # avoid pip bugs - ./virtualenv/bin/pip install --upgrade pip +# Upgrade pip first +./virtualenv/bin/pip install --upgrade pip - # work-around change in pip 1.5 - ./virtualenv/bin/pip install 'setuptools<18.6' --no-use-wheel --upgrade -fi +# work-around change in pip 1.5 +./virtualenv/bin/pip install 'setuptools<18.6' --no-use-wheel --upgrade ./virtualenv/bin/pip install --upgrade -r requirements.txt -- 2.39.5