zuul
/
zuul
Code Issues Proposed changes

Install virtualenv from source 

Don't use system virtualenv. Install it from source/pypi.

Change-Id: Idea7291cb6bff9d23c87fd40b3bb45f32115b7ef
This commit is contained in:
Clark Boylan 2019-03-15 12:00:26 -07:00 committed by Tobias Henkel
parent d5ea9cdd69
commit 51a0635f68
No known key found for this signature in database
GPG Key ID: 03750DEC158E5FA2
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindep.txt
View File

@ -30,9 +30,6 @@ libffi6 [platform:dpkg]
libffi-devel [compile test platform:rpm] libffi-devel [compile test platform:rpm]
python3-dev [compile test platform:dpkg platform:apk] python3-dev [compile test platform:dpkg platform:apk]
python3-devel [compile test platform:rpm] python3-devel [compile test platform:rpm]
python-virtualenv [platform:dpkg]
python3-virtualenv [platform:rpm]
py3-virtualenv [compile test platform:apk]
bubblewrap [!platform:ubuntu-xenial] bubblewrap [!platform:ubuntu-xenial]
libre2-dev [compile test platform:dpkg] libre2-dev [compile test platform:dpkg]
libre2-4 [platform:ubuntu-bionic] libre2-4 [platform:ubuntu-bionic]

1
requirements.txt
View File

@ -1,4 +1,5 @@
pbr>=1.1.0 pbr>=1.1.0
virtualenv
github3.py>=1.1.0 github3.py>=1.1.0
PyYAML>=3.1.0 PyYAML>=3.1.0

3
zuul/lib/ansible.py
View File

@ -92,7 +92,8 @@ class ManagedAnsible:
# We don't use directly the venv module here because its behavior is # We don't use directly the venv module here because its behavior is
# broken if we're already in a virtual environment. # broken if we're already in a virtual environment.
cmd = ['virtualenv', '-p', python_executable, venv_path] cmd = [sys.executable, '-m', 'virtualenv',
'-p', python_executable, venv_path]
p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if p.returncode != 0: if p.returncode != 0: