From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 21 May 2020 14:48:34 +0000 (-0400)
Subject: bootstrap: remove deprecated virtualenv options
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ebb504159791a2bc45331d9ff493257a5f8913c;p=s3-tests.git

bootstrap: remove deprecated virtualenv options

this fails on Ubuntu 20.04:

> virtualenv: error: unrecognized arguments: --no-site-packages --distribute

according to `virtualenv -h`:

>   --no-site-packages    DEPRECATED. Retained only for backward compatibility.
>                         Not having access to global site-packages is now the
>                         default behavior.
>   --distribute          DEPRECATED. Retained only for backward compatibility.
>                         This option has no effect.

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a0c15c80ad95257d713e7587f070772f416122d6)
---

diff --git a/bootstrap b/bootstrap
index 8434767a..018597a6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -59,7 +59,7 @@ esac
 
 
 # s3-tests only works on python 3.6 not newer versions of python3
-${virtualenv} --python=$(which python3.6) --no-site-packages --distribute virtualenv
+${virtualenv} --python=$(which python3.6) virtualenv
 
 # avoid pip bugs
 ./virtualenv/bin/pip3 install --upgrade pip