mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
Merge pull request #20377 from Unity-Technologies/pass-envs-virtualenv
Added the ability to pass env_vars to pip via the virtualenv.managed sta...
This commit is contained in:
commit
7943a60954
@ -46,7 +46,8 @@ def managed(name,
|
||||
pip_download_cache=None,
|
||||
pip_exists_action=None,
|
||||
proxy=None,
|
||||
use_vt=False):
|
||||
use_vt=False,
|
||||
env_vars=None):
|
||||
'''
|
||||
Create a virtualenv and optionally manage it with pip
|
||||
|
||||
@ -66,6 +67,11 @@ def managed(name,
|
||||
(w)ipe, (b)ackup
|
||||
proxy: None
|
||||
Proxy address which is passed to "pip install"
|
||||
env_vars
|
||||
Set environment variables that some builds will depend on. For example,
|
||||
a Python C-module may have a Makefile that needs INCLUDE_PATH set to
|
||||
pick up a header file while compiling.
|
||||
|
||||
|
||||
Also accepts any kwargs that the virtualenv module will.
|
||||
|
||||
@ -190,7 +196,8 @@ def managed(name,
|
||||
exists_action=pip_exists_action,
|
||||
no_deps=no_deps,
|
||||
proxy=proxy,
|
||||
use_vt=use_vt
|
||||
use_vt=use_vt,
|
||||
env_vars=env_vars
|
||||
)
|
||||
ret['result'] &= _ret['retcode'] == 0
|
||||
if _ret['retcode'] > 0:
|
||||
|
Loading…
Reference in New Issue
Block a user