bootstrap: Drop virtualenv in favor of venv

We don't need it, and if it is present, setuptools will use
easy_install instead of building wheels.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/bootstrap b/bootstrap
index 968b91e02b44c74487d79482962ec3680140a13c..9c57072f2550f88af0d4135828e7a11608061b17 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -23,7 +23,7 @@ case "$(uname -s)" in
 Linux)
     case "$(lsb_release --id --short)" in
     Ubuntu|Debian|LinuxMint)
-        deps=(qemu-utils python3-dev libssl-dev python3-pip python3-virtualenv libev-dev libvirt-dev libffi-dev libyaml-dev)
+        deps=(qemu-utils python3-dev libssl-dev python3-pip python3-venv libev-dev libvirt-dev libffi-dev libyaml-dev)
         for package in ${deps[@]}; do
             if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then
                 # add a space after old values
@@ -44,7 +44,7 @@ Linux)
         fi
         ;;
     RedHatEnterpriseWorkstation|RedHatEnterpriseServer|RedHatEnterprise|CentOS)
-        deps=(python3-pip python3-devel python3-virtualenv mariadb-devel libev-devel libvirt-devel libffi-devel)
+        deps=(python3-pip python3-devel mariadb-devel libev-devel libvirt-devel libffi-devel)
         for package in ${deps[@]}; do
           if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
               missing="${missing:+$missing }$package"
@@ -64,7 +64,7 @@ Linux)
         fi
         ;;
     Fedora)
-        deps=(python3-pip python3-devel python3-virtualenv libev-devel libvirt-devel libffi-devel)
+        deps=(python3-pip python3-devel libev-devel libvirt-devel libffi-devel)
         for package in ${deps[@]}; do
           if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
               missing="${missing:+$missing }$package"
@@ -89,7 +89,7 @@ Linux)
         fi
         ;;
     "openSUSE project"|"SUSE LINUX"|"openSUSE")
-       deps=(python3-pip python3-devel python3-virtualenv libev-devel libvirt-devel libffi-devel)
+       deps=(python3-pip python3-devel python3 libev-devel libvirt-devel libffi-devel)
        for package in ${deps[@]}; do
             if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
                 if [ "$(rpm -q --whatprovides $package)" == "no package provides $package" ]; then
@@ -135,19 +135,15 @@ Darwin)
     ;;
 esac
 
-# Forcibly remove old virtualenvs which used system site-packages
-if [ -e ./$VENV ]  && [ ! -e ./$VENV/lib/python*/no-global-site-packages.txt ]; then
-    echo "Removing old virtualenv because it uses system site-packages"
-    rm -rf ./$VENV
+# If the venv was set to use system site-packages, fix that
+if [ -f "$VENV/pyvenv.cfg" ]; then
+    sed -i'' -e 's/\(include-system-site-packages\s*=\s*\)true/\1false/g' $VENV/pyvenv.cfg
 fi
 
 export LC_ALL=en_US.UTF-8
 
 if [ -z "$NO_CLOBBER" ] || [ ! -e ./$VENV ]; then
-    if ! virtualenv --version &>/dev/null; then
-        pip install virtualenv
-    fi
-    virtualenv --python=$PYTHON $VENV
+    python3 -m venv $VENV
 fi
 
 # First, upgrade pip

diff --git a/docs/docker-compose/teuthology/Dockerfile b/docs/docker-compose/teuthology/Dockerfile
index fc40eb4643b90407f06329b0e817b1901a2c6008..b65e916c65729a1a526aacde42cd06385d876ebe 100644 (file)
--- a/docs/docker-compose/teuthology/Dockerfile
+++ b/docs/docker-compose/teuthology/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
     libssl-dev \
     ipmitool \
     python3-pip \
-    python3-virtualenv \
+    python3-venv \
     vim \
     libev-dev \
     libvirt-dev \