From d61aa5a00fefad2cafcfd5b9c8d514d56baeb541 Mon Sep 17 00:00:00 2001 From: Alex Zorin Date: Wed, 28 Jun 2023 15:24:13 +1000 Subject: [PATCH] Revert "ci: try use a venv for tox" This reverts commit 57ce2a9226e11a63438aa033ae5c9d87ed7d4f1d. --- .azure-pipelines/templates/steps/tox-steps.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml index 44343f94d..e7f3ac70c 100644 --- a/.azure-pipelines/templates/steps/tox-steps.yml +++ b/.azure-pipelines/templates/steps/tox-steps.yml @@ -26,8 +26,7 @@ steps: addToPath: true - bash: | set -e - python3 -m venv venv - venv/bin/python tools/pip_install.py tox + python3 tools/pip_install.py tox displayName: Install runtime dependencies - task: DownloadSecureFile@1 name: testFarmPem @@ -39,7 +38,7 @@ steps: export TARGET_BRANCH="`echo "${BUILD_SOURCEBRANCH}" | sed -E 's!refs/(heads|tags)/!!g'`" [ -z "${SYSTEM_PULLREQUEST_TARGETBRANCH}" ] || export TARGET_BRANCH="${SYSTEM_PULLREQUEST_TARGETBRANCH}" env - venv/bin/python -m tox + python3 -m tox env: AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) @@ -49,7 +48,7 @@ steps: # status code to prevent problems here from causing build failures. If # this turns out to work well, we can change this. - bash: | - venv/bin/python tools/pip_install.py -I coverage + python3 tools/pip_install.py -I coverage case "$AGENT_OS" in Darwin) CODECOV_URL="https://uploader.codecov.io/latest/macos/codecov"