From: Vasu Kulkarni <vasu@redhat.com>
Date: Mon, 29 Apr 2019 19:58:06 +0000 (-0700)
Subject: upgrade setuptools first and install rest of the dependencies later
X-Git-Tag: v2.1.0~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62f6642fd256f1ae69da13bfbffdffb9818cea59;p=ceph-deploy.git

upgrade setuptools first and install rest of the dependencies later

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/bootstrap b/bootstrap
index c41c274..2580fbc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -85,6 +85,7 @@ if ! [ -d virtualenv ]; then
                 # https://github.com/pypa/virtualenv/issues/463
 
                 virtualenv virtualenv_tmp
+                virtualenv_tmp/bin/pip install --upgrade setuptools
                 virtualenv_tmp/bin/pip install --upgrade virtualenv
                 virtualenv_tmp/bin/virtualenv -p "$python_executable" virtualenv
                 rm -rf virtualenv_tmp
@@ -97,5 +98,6 @@ if ! [ -d virtualenv ]; then
 fi
 
 test -d virtualenv || virtualenv -p "$python_executable" virtualenv
+./virtualenv/bin/pip install --upgrade setuptools
 ./virtualenv/bin/python setup.py develop
 test -e ceph-deploy || ln -s virtualenv/bin/ceph-deploy .