diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-12 15:15:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-12 15:15:12 +0000 |
| commit | f0a2907e58bdfacf92856817597d359e4a2b0678 (patch) | |
| tree | 17f7f671b99bc48147d6b71ad77b6a931d8698f2 | |
| parent | f5f429bac6446db084ca3f5d86c64127a1e539f2 (diff) | |
| parent | de5e6ea29efe02de42d95109e22bdd0039789f1b (diff) | |
| download | nova-f0a2907e58bdfacf92856817597d359e4a2b0678.tar.gz nova-f0a2907e58bdfacf92856817597d359e4a2b0678.tar.xz nova-f0a2907e58bdfacf92856817597d359e4a2b0678.zip | |
Merge "install_venv: refactor out pip_install helper"
| -rw-r--r-- | tools/install_venv.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 3c2f6979f..19bf04da5 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -97,14 +97,19 @@ def create_virtualenv(venv=VENV): print 'done.' +def pip_install(*args): + run_command(['tools/with_venv.sh', 'pip', 'install'] + list(args), + redirect_output=False) + + def install_dependencies(venv=VENV): print 'Installing dependencies with pip (this can take a while)...' + # Install greenlet by hand - just listing it in the requires file does not # get it in stalled in the right order - run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, - 'greenlet'], redirect_output=False) - run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, '-r', - PIP_REQUIRES], redirect_output=False) + pip_install('greenlet') + + pip_install('-r', PIP_REQUIRES) # Tell the virtual env how to "import nova" pthfile = os.path.join(venv, "lib", PY_VERSION, "site-packages", |