From 3f3205fc8940fcc4c42eeec9f2aef438c74c7879 Mon Sep 17 00:00:00 2001 From: Venkatrangan Govindarajan Date: Tue, 1 Sep 2020 17:23:21 +0530 Subject: [PATCH 1/1] Fix the recent issue with python3 Signed-off-by: Venkatrangan Govindarajan Change-Id: I7f6169b98dcb0d8e215e41dff6590beff12d3e3c --- jjb/autorelease/autorelease-macros.yaml | 2 +- jjb/integration/integration-install-robotframework.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 3a3d55bbbe..cdfe01cdc6 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -45,7 +45,7 @@ - shell: | #!/bin/bash -l set -xe -o pipefail - virtualenv -p python3 --system-site-packages $WORKSPACE/venv + python3 -m venv $WORKSPACE/venv source $WORKSPACE/venv/bin/activate PYTHON="$WORKSPACE/venv/bin/python" $PYTHON -m pip install --upgrade networkx diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh index e91454dcb0..2a961fdb14 100644 --- a/jjb/integration/integration-install-robotframework.sh +++ b/jjb/integration/integration-install-robotframework.sh @@ -16,7 +16,7 @@ echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties" # The --system-site-packages parameter allows us to pick up system level # installed packages. This allows us to bake matplotlib which takes very long # to install into the image. -virtualenv -p python3 --system-site-packages "${ROBOT_VENV}" +python3 -m venv "${ROBOT_VENV}" # shellcheck disable=SC1090 source "${ROBOT_VENV}/bin/activate" @@ -28,7 +28,6 @@ python -m pip install --upgrade pip echo "Installing Python Requirements" cat << 'EOF' > "requirements.txt" docker-py -importlib ipaddr netaddr netifaces -- 2.36.6