ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

fix proposal for issue #25151: [python3] pip failed to create virtual env when using custom command (pyvenv) (#25241)

Browse source 
* Fix proposal for bug 25151

* Fix proposal for bug 25151 - pip module, pyvenv validation

* Graceful fail when virtualenv_python is defined and virtualenv_command uses the venv module

* Making sure that venv is being used as a modue "-m venv"

* Updating syntax in validations

* Updating syntax in validations - fixing stupid typo "[)"

* Raising an error if virtualenv_command is pyvenv or venv and virtualenv_python is used

* trailing whitespace gone, pyvenv, venv validation and docs update

* cleaning whitespaces from blank lines
This commit is contained in:
Ramon 2017-06-05 19:03:15 -05:00 • committed by Toshio Kuratomi
parent cf59f9765e
commit bc4a8dbaa4
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/ansible/modules/packaging/language/pip.py
View file

@ -84,7 +84,9 @@ options:
description: description:
- The Python executable used for creating the virtual environment. - The Python executable used for creating the virtual environment.
For example C(python3.5), C(python2.7). When not specified, the For example C(python3.5), C(python2.7). When not specified, the
Python version used to run the ansible module is used. Python version used to run the ansible module is used. This parameter
should not be used when C(virtualenv_command) is using C(pyvenv) or
the C(-m venv) module.
required: false required: false
default: null default: null
state: state:
@ -457,16 +459,27 @@ def main():
if '--no-site-packages' in cmd_opts: if '--no-site-packages' in cmd_opts:
cmd += ' --no-site-packages' cmd += ' --no-site-packages'
if virtualenv_python: # -p is a virtualenv option, not compatible with pyenv or venv
cmd += ' -p%s' % virtualenv_python # this if validates if the command being used is not any of them
elif PY3: if not any(ex in module.params['virtualenv_command'] for ex in ('pyvenv', '-m venv')):
# Ubuntu currently has a patch making virtualenv always if virtualenv_python:
# try to use python2. Since Ubuntu16 works without cmd += ' -p%s' % virtualenv_python
# python2 installed, this is a problem. This code mimics elif PY3:
# the upstream behaviour of using the python which invoked # Ubuntu currently has a patch making virtualenv always
# virtualenv to determine which python is used inside of # try to use python2. Since Ubuntu16 works without
# the virtualenv (when none are specified). # python2 installed, this is a problem. This code mimics
cmd += ' -p%s' % sys.executable # the upstream behaviour of using the python which invoked
# virtualenv to determine which python is used inside of
# the virtualenv (when none are specified).
cmd += ' -p%s' % sys.executable
# if venv or pyvenv are used and virtualenv_python is defined, then
# virtualenv_python is ignored, this has to be acknowledged
elif module.params['virtualenv_python']:
module.fail_json(
msg='virtualenv_python should not be used when'
' using the venv module or pyvenv as virtualenv_command'
)
cmd = "%s %s" % (cmd, env) cmd = "%s %s" % (cmd, env)
rc, out_venv, err_venv = module.run_command(cmd, cwd=chdir) rc, out_venv, err_venv = module.run_command(cmd, cwd=chdir)