From 9d486a964754fa04ba8a2ea499aab3da956f31e7 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 18 Apr 2018 11:04:29 +0100 Subject: [PATCH] Only replace python when re-initializing the venv We reinitialize the venv to ensure that the right version of python is in the venv, but we do not want virtualenv to also replace pip, setuptools and wheel so we tell it not to. If we don't do this then virtualenv will install the latest available version, which is not what we want. Change-Id: I59a70585a2bfe4916b3df8eb627f6f6a4b1ef19b Partial-Bug: #1764470 (cherry picked from commit 365cbc29b1ccfaa8aa6ef12f782795f201aa8062) --- tasks/trove_install.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tasks/trove_install.yml b/tasks/trove_install.yml index 95e2c50..98a454c 100644 --- a/tasks/trove_install.yml +++ b/tasks/trove_install.yml @@ -121,11 +121,22 @@ - ansible_pkg_mgr in ['yum', 'dnf', 'zypper'] - trove_get_venv | changed +# NOTE(odyssey4me): +# We reinitialize the venv to ensure that the right +# version of python is in the venv, but we do not +# want virtualenv to also replace pip, setuptools +# and wheel so we tell it not to. +# We do not use --always-copy for CentOS/SuSE due +# to https://github.com/pypa/virtualenv/issues/565 - name: Update virtualenv path shell: | find {{ trove_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ trove_bin | replace ('/','\/') }}\/python/' {{ trove_bin }}/* - virtualenv {{ trove_bin | dirname }} + virtualenv {{ trove_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: trove_get_venv | changed tags: - skip_ansible_lint