diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-23 11:22:44 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-23 11:22:44 -0700 |
| commit | 1afc0995bc77fbbb7f724e5086762f64ddc53c31 (patch) | |
| tree | a6c0847d01945cfba761b0991480212d07c2a06f /tools | |
| parent | e74b8070f73d8bada01cfe2d26223e5180ab67fb (diff) | |
| parent | e6c1c9dcef9f57930783a64ecb0595ba8e714c4c (diff) | |
merged trunk
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 4 | ||||
| -rw-r--r-- | tools/pip-requires | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 5d2369a96..32c372352 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 dd69708ce..1e2707be7 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -7,15 +7,16 @@ amqplib==0.6.1 anyjson==0.2.4 boto==2.0b1 carrot==0.10.5 -eventlet==0.9.10 +eventlet==0.9.12 lockfile==0.8 python-daemon==1.5.5 python-gflags==1.3 redis==2.0.0 routes==1.12.3 tornado==1.0 -webob==0.9.8 +WebOb==0.9.8 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 |