From f38d03f6fb197761af290464a638d6ddface8aba Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Mon, 12 Apr 2021 16:15:59 -0500 Subject: [PATCH] [ansible-test] nuke virtualenv-isolated.sh Change: - This isn't used in our tests, so the suggestion was to just remove it. Signed-off-by: Rick Elrod --- .../ansible-test-nuke-venv-isolated.yml | 2 ++ .../_data/injector/virtualenv-isolated.sh | 18 ------------------ 2 files changed, 2 insertions(+), 18 deletions(-) create mode 100644 changelogs/fragments/ansible-test-nuke-venv-isolated.yml delete mode 100644 test/lib/ansible_test/_data/injector/virtualenv-isolated.sh diff --git a/changelogs/fragments/ansible-test-nuke-venv-isolated.yml b/changelogs/fragments/ansible-test-nuke-venv-isolated.yml new file mode 100644 index 00000000000..eb15d326969 --- /dev/null +++ b/changelogs/fragments/ansible-test-nuke-venv-isolated.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - virtualenv-isolated.sh is no longer provided. Prefer virtualenv.sh in its place. diff --git a/test/lib/ansible_test/_data/injector/virtualenv-isolated.sh b/test/lib/ansible_test/_data/injector/virtualenv-isolated.sh deleted file mode 100644 index 316d094b3b3..00000000000 --- a/test/lib/ansible_test/_data/injector/virtualenv-isolated.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -# Create and activate a fresh virtual environment with `source virtualenv-isolated.sh`. - -rm -rf "${OUTPUT_DIR}/venv" - -# Try to use 'venv' if it is available, then fallback to 'virtualenv' since some systems provide 'venv' although it is non-functional. -if [[ "${ANSIBLE_TEST_PYTHON_VERSION}" =~ ^2\. ]] || ! "${ANSIBLE_TEST_PYTHON_INTERPRETER}" -m venv "${OUTPUT_DIR}/venv" > /dev/null 2>&1; then - rm -rf "${OUTPUT_DIR}/venv" - "${ANSIBLE_TEST_PYTHON_INTERPRETER}" -m virtualenv --python "${ANSIBLE_TEST_PYTHON_INTERPRETER}" "${OUTPUT_DIR}/venv" -fi - -set +ux -source "${OUTPUT_DIR}/venv/bin/activate" -set -ux - -if [[ "${ANSIBLE_TEST_COVERAGE}" ]]; then - pip install coverage -c ../../../runner/requirements/constraints.txt --disable-pip-version-check -fi