valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added ability to activate a virtualenv before

Browse Source 
running pip install
This commit is contained in:
Matt George 2013-05-17 13:56:09 -05:00
parent 5200ed71fd
commit ecdff63b6e
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/modules/pip.py
View File

@ -63,6 +63,16 @@ def _get_cached_requirements(requirements):
return cached_requirements
def _get_env_activate(bin_env):
if not bin_env:
raise CommandNotFoundError('Could not find a `activate` binary')
if os.path.isdir(bin_env):
activate_bin = os.path.join(bin_env, 'bin', 'activate')
if os.path.isfile(activate_bin):
return activate_bin
raise CommandNotFoundError('Could not find a `activate` binary')
def install(pkgs=None,
requirements=None,
env=None,
@ -91,6 +101,7 @@ def install(pkgs=None,
runas=None,
no_chown=False,
cwd=None,
activate=False,
__env__='base'):
'''
Install packages with pip
@ -173,6 +184,9 @@ def install(pkgs=None,
a requirements file
cwd
Current working directory to run pip from
activate
Activates the virtual environment, if given via bin_env,
before running install.
CLI Example::
@ -201,6 +215,9 @@ def install(pkgs=None,
cmd = '{0} install'.format(_get_pip_bin(bin_env))
if activate and bin_env:
cmd = '. {0} && {1}'.format(_get_env_activate(bin_env), cmd)
if pkgs:
pkg = pkgs.replace(',', ' ')
# It's possible we replaced version-range commas with semicolons so

12
tests/unit/modules/pip_test.py
View File

@ -35,3 +35,15 @@ class PipTestCase(TestCase):
pip.install(requirements="salt://requirements.txt")
expected_cmd = 'pip install --requirement "my_cached_reqs" '
mock.assert_called_once_with(expected_cmd, runas=None, cwd=None)
@patch('os.path')
def test_fix_activate_env(self, mock_path):
mock_path.is_file.return_value = True
mock_path.isdir.return_value = True
def join(*args):
return '/'.join(args)
mock_path.join = join
mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
pip.install('mock', bin_env='/test_env', activate=True)
expected_cmd = '. /test_env/bin/activate && /test_env/bin/pip install mock '
mock.assert_called_once_with(expected_cmd, runas=None, cwd=None)