From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 25 Jan 2017 16:04:51 +0000 (-0500)
Subject: bootstrap:  force new setuptools
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F139%2Fhead;p=s3-tests.git

bootstrap:  force new setuptools

Deal setuptools upgrade problem discussed here:
 https://github.com/pypa/setuptools/issues/940

Now follows the same formula as upstream teuthology.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/bootstrap b/bootstrap
index 69cfb0a2..54dec725 100755
--- a/bootstrap
+++ b/bootstrap
@@ -30,8 +30,8 @@ virtualenv --no-site-packages --distribute virtualenv
 # avoid pip bugs
 ./virtualenv/bin/pip install --upgrade pip
 
-# work-around change in pip 1.5
-./virtualenv/bin/pip install setuptools --no-use-wheel --upgrade
+# work-around change in pip 1.5 (and more recent)
+./virtualenv/bin/pip install setuptools --upgrade
 
 ./virtualenv/bin/pip install -r requirements.txt