From 4143ce6fc95ccd9bde88c22baaa3eeaba58183f8 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 13 Jan 2020 16:05:11 +1100 Subject: [PATCH] Create virtualenv with abstracted VIRTUALENV_CMD Just calling "virtualenv" makes a Python 2 based environment; setuptools just dropped Python 2 support (as Python 2 reached EOL in Jan 2020) so this has now become a breakage. Although the Python 2 path won't work, use the abstracted command. This should stop us having to revisit this for any future cleanups (or switing to venv, etc). Change-Id: I531e971b78491a9276753c0d86b04c4adbd224aa --- lib/infra | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/infra b/lib/infra index cf003cce01..b983f2b739 100644 --- a/lib/infra +++ b/lib/infra @@ -29,7 +29,7 @@ GITDIR["pbr"]=$DEST/pbr # install_infra() - Collect source and prepare function install_infra { local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv" - [ ! -d $PIP_VIRTUAL_ENV ] && virtualenv $PIP_VIRTUAL_ENV + [ ! -d $PIP_VIRTUAL_ENV ] && ${VIRTUALENV_CMD} $PIP_VIRTUAL_ENV # We don't care about testing git pbr in the requirements venv. PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR