]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
upgrade setuptools first and install rest of the dependencies later RM-39527 486/head
authorVasu Kulkarni <vasu@redhat.com>
Mon, 29 Apr 2019 19:58:06 +0000 (12:58 -0700)
committerVasu Kulkarni <vasu@redhat.com>
Mon, 29 Apr 2019 19:58:06 +0000 (12:58 -0700)
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
bootstrap

index c41c2749c263c769f6fa2d44d4c8bf18087ef568..2580fbc485c6a41abc52d9ea2cb697f5ea877556 100755 (executable)
--- 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 .