summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv.py5
-rw-r--r--tools/pip-requires2
-rw-r--r--tools/test-requires1
3 files changed, 6 insertions, 2 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 20fd25f76..ca245644c 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -105,6 +105,9 @@ def create_virtualenv(venv=VENV):
if not run_command([WITH_VENV, 'easy_install', 'pip']).strip():
die("Failed to install pip.")
print 'done.'
+ print 'Installing distribute in virtualenv...'
+ pip_install('distribute>=0.6.24')
+ print 'done.'
def pip_install(*args):
@@ -115,8 +118,8 @@ def pip_install(*args):
def install_dependencies(venv=VENV):
print "Installing dependencies..."
print "(This may take several minutes, don't panic)"
- pip_install('-r', PIP_REQUIRES)
pip_install('-r', TEST_REQUIRES)
+ pip_install('-r', PIP_REQUIRES)
# Tell the virtual env how to "import dashboard"
py = 'python%d.%d' % (sys.version_info[0], sys.version_info[1])
diff --git a/tools/pip-requires b/tools/pip-requires
index 22f00385f..498cc1b08 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -13,7 +13,7 @@ pycrypto==2.3
routes
sqlalchemy
sqlalchemy-migrate
-webob
+webob==1.0.8
xattr
iso8601
diff --git a/tools/test-requires b/tools/test-requires
index 6aaa187c5..c8fa4b422 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -6,6 +6,7 @@ mox
nose
pep8
pylint
+distribute>=0.6.24
# Docs Requirements
sphinx