diff options
| author | Kefu Chai <kchai@redhat.com> | 2020-03-12 07:33:44 +0100 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2020-03-12 07:52:13 +0100 |
| commit | e69ec07c71d84904c338457a37c359c2624434a2 (patch) | |
| tree | c53b97a459aeb66fe0d5353063843d4ecd5ebc80 | |
| parent | install-deps.sh: install additional repo for RHEL8 (diff) | |
| download | ceph-e69ec07c71d84904c338457a37c359c2624434a2.tar.xz ceph-e69ec07c71d84904c338457a37c359c2624434a2.zip | |
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>
| -rwxr-xr-x | install-deps.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/install-deps.sh b/install-deps.sh index 9ea811abc95..fb377af7561 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 |