mirror of https://github.com/ansible/ansible.git
ansible-test - prefer venv over virtualenv on Python 3 (#73000)
Also pin virtualenv to 16.7.10 for older Mac OS X systems. This was the version being installed anway with the previous constraint (<20). On systems with Python 3, now prefer venv over virtualenv. Test to see if venv is functional since some systems have a non-functional venv installation (such as Debian).pull/73017/head
parent
5e03e322de
commit
850a77f639
@ -0,0 +1,3 @@
|
|||||||
|
minor_changes:
|
||||||
|
- ansible-test - virtualenv helper scripts now prefer ``venv`` on Python 3 over ``virtualenv``
|
||||||
|
- ansible-test - remote macOS instances no longer install ``virtualenv`` during provisioning
|
@ -1,8 +1,14 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Create and activate a fresh virtual environment with `source virtualenv.sh`.
|
# Create and activate a fresh virtual environment with `source virtualenv.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 --system-site-packages "${OUTPUT_DIR}/venv" > /dev/null 2>&1; then
|
||||||
rm -rf "${OUTPUT_DIR}/venv"
|
rm -rf "${OUTPUT_DIR}/venv"
|
||||||
"${ANSIBLE_TEST_PYTHON_INTERPRETER}" -m virtualenv --system-site-packages --python "${ANSIBLE_TEST_PYTHON_INTERPRETER}" "${OUTPUT_DIR}/venv"
|
"${ANSIBLE_TEST_PYTHON_INTERPRETER}" -m virtualenv --system-site-packages --python "${ANSIBLE_TEST_PYTHON_INTERPRETER}" "${OUTPUT_DIR}/venv"
|
||||||
|
fi
|
||||||
|
|
||||||
set +ux
|
set +ux
|
||||||
source "${OUTPUT_DIR}/venv/bin/activate"
|
source "${OUTPUT_DIR}/venv/bin/activate"
|
||||||
set -ux
|
set -ux
|
||||||
|
Loading…
Reference in New Issue