From f7ccf23ea6cdf108fdb4cb728abe64738843f35b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 17 Apr 2012 12:12:30 -0700
Subject: [PATCH] Add distribute to test-requires.

Currently glance (which is required for testing by keystone because
there is no python-glanceclient yet) requires distribute>=0.6.24,
but it can't be installed as a dependency of a dependency.  Requiring
it explicitly here should help.

Install test-requires first, otherwise distribute doesn't get properly set.

Install distribute manually until we can re-address venv creation.

Align webob version to the other projects due to version conflicts.

Change-Id: Iac0b6860c600fbf230cf4f602ce1b76c68fcb7cd
---
 .mailmap              | 3 +--
 AUTHORS               | 2 +-
 tools/install_venv.py | 5 ++++-
 tools/pip-requires    | 2 +-
 tools/test-requires   | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index d98b4638b5..595bcba030 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,5 +5,4 @@
 <jake@ansolabs.com> <admin@jakedahn.com>
 <launchpad@markgius.com> <mgius7096@gmail.com>
 <yorik.sar@gmail.com> <yorik@ytaraday>
-
-
+<jeblair@hp.com> <james.blair@rackspace.com>
diff --git a/AUTHORS b/AUTHORS
index e41eb8164f..1299a80ac2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,7 +21,7 @@ Ivan Kolodyazhny <e0ne@e0ne.info>
 J. Daniel Schmidt <jdsn@suse.de>
 Jake Dahn <jake@ansolabs.com>
 Jake Zukowski <jake@ponyloaf.com>
-James E. Blair <james.blair@rackspace.com>
+James E. Blair <jeblair@hp.com>
 Jay Pipes <jaypipes@gmail.com>
 Jeffrey Wilcox <jeffjapan@gmail.com>
 Jesse Andrews <anotherjesse@gmail.com>
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 20fd25f766..ca245644c8 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 22f00385fe..498cc1b08c 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 6aaa187c52..c8fa4b4229 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -6,6 +6,7 @@ mox
 nose
 pep8
 pylint
+distribute>=0.6.24
 
 # Docs Requirements
 sphinx