diff options
| author | Monty Taylor <mordred@inaugust.com> | 2010-09-20 13:40:42 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-09-20 13:40:42 +0000 |
| commit | cda407fa0eff533e3aae7d3bf7276e0013a8a13d (patch) | |
| tree | ef8ec14a16529fc634af636c4bb03ec3003dae33 /tools | |
| parent | 1c86ede78e75f82825fa5d135451d5f2bed65def (diff) | |
| parent | 7f666230e37745b174998a485fe1d7626c4862ae (diff) | |
| download | nova-cda407fa0eff533e3aae7d3bf7276e0013a8a13d.tar.gz | |
A small fix to the install_venv program to allow us to run it on the tarmac box as part of the tarmac build.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 4 | ||||
| -rw-r--r-- | tools/pip-requires | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 5d2369a96b..32c3723526 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -88,6 +88,10 @@ def create_virtualenv(venv=VENV): 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) run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, TWISTED_NOVA], diff --git a/tools/pip-requires b/tools/pip-requires index dd69708cea..325d743637 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -19,3 +19,4 @@ wsgiref==0.1.2 zope.interface==3.6.1 mox==0.5.0 -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz +greenlet==0.3.1 |