From: Kefu Chai <kchai@redhat.com>
Date: Thu, 12 Mar 2020 06:33:44 +0000 (+0800)
Subject: install-deps.sh: remove the workaround to bootstrap a new venv
X-Git-Tag: v15.1.1~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33905%2Fhead;p=ceph.git

install-deps.sh: remove the workaround to bootstrap a new venv

el7 now ships python36-virtualenv-15.1.0-4 which contains the fix of
https://github.com/pypa/virtualenv/issues/463

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/install-deps.sh b/install-deps.sh
index 9ea811abc959..fb377af75618 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -434,17 +434,7 @@ function activate_virtualenv() {
     local env_dir=$top_srcdir/install-deps-python3
 
     if ! test -d $env_dir ; then
-        # Make a temporary virtualenv to get a fresh version of virtualenv
-        # because CentOS 7 has a buggy old version (v1.10.1)
-        # https://github.com/pypa/virtualenv/issues/463
-        virtualenv --python=python3 ${env_dir}_tmp
-        # install setuptools before upgrading virtualenv, as the latter needs
-        # a recent setuptools for setup commands like `extras_require`.
-        ${env_dir}_tmp/bin/pip install --upgrade setuptools
-        ${env_dir}_tmp/bin/pip install --upgrade virtualenv
-        ${env_dir}_tmp/bin/virtualenv --python python3 $env_dir
-        rm -rf ${env_dir}_tmp
-
+        virtualenv --python=python3 ${env_dir}
         . $env_dir/bin/activate
         if ! populate_wheelhouse install ; then
             rm -rf $env_dir