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: I9205f5f3183eff8059e7589b6a3a2bbf36f8b60a
Partial-Bug: #1764470
(cherry picked from commit 1f606ff461
)
This commit is contained in:
parent
5973730dcd
commit
7db164e274
|
@ -93,11 +93,22 @@
|
|||
when: watcher_get_venv | failed or watcher_get_venv | skipped
|
||||
notify: Restart watcher services
|
||||
|
||||
# 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 {{ watcher_bin }} -name \*.pyc -delete
|
||||
sed -si '1s/^.*python.*$/#!{{ watcher_bin | replace ('/','\/') }}\/python/' {{ watcher_bin }}/*
|
||||
virtualenv {{ watcher_bin | dirname }}
|
||||
virtualenv {{ watcher_bin | dirname }} \
|
||||
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
|
||||
--no-pip \
|
||||
--no-setuptools \
|
||||
--no-wheel
|
||||
when: watcher_get_venv | changed
|
||||
tags:
|
||||
- skip_ansible_lint
|
||||
|
|
Loading…
Reference in New Issue