Use OpenStack common project requires.

This patch is an update of pip-requires and test-requires
using the openstack/requirements script.

One exception was made to pep8, which is being fixed in the
upstream script.

Change-Id: I4bd61e0ec6f1995f9f36a724eb8dbe15345caca0

diff --git a/tools/pip-requires b/tools/pip-requires
index b4266fe1dba235ece857573b561e8cf7634bfc29..ae2bdf75011377859ee63b69964f6632703aa555 100644 (file)
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,25 +1,26 @@
-SQLAlchemy>=0.7.3,<=0.7.9
+# This file is managed by openstack-depends
 amqplib>=0.6.1
 anyjson>=0.2.4
 argparse
-eventlet>=0.9.17
+babel>=0.9.6
+eventlet>=0.9.12
+greenlet>=0.3.1
+iso8601>=0.1.4
 kombu>=1.0.4
 lockfile>=0.8
 lxml>=2.3
-routes>=1.12.3
-WebOb==1.2.3
-wsgiref>=0.1.2
-greenlet>=0.3.1
-PasteDeploy>=1.5.0
+oslo.config>=1.1.0
+paramiko>=1.8.0
 paste
-sqlalchemy-migrate>=0.7.2
-stevedore>=0.8.0
-suds>=0.4
-paramiko
-Babel>=0.9.6
-iso8601>=0.1.4
-setuptools_git>=0.4
+pastedeploy>=1.5.0
 python-glanceclient>=0.5.0,<2
-python-keystoneclient>=0.2.0
-python-swiftclient
-oslo.config>=1.1.0
+python-keystoneclient>=0.2,<0.3
+python-swiftclient>=1.2,<2
+routes>=1.12.3
+setuptools_git>=0.4
+sqlalchemy>=0.7,<=0.7.99
+sqlalchemy-migrate>=0.7
+stevedore>=0.7
+suds>=0.4
+webob>=1.0.8
+wsgiref>=0.1.2

diff --git a/tools/test-requires b/tools/test-requires
index 29220438a50a797a82623c9d39da2913d5de4c1f..4d20dab2c66b5c2710bfbddbaee4aa634fcd7d2a 100644 (file)
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,16 +1,15 @@
-# Packages needed for dev testing
-distribute>=0.6.28
-
-coverage
-mock
+# This file is managed by openstack-depends
+coverage>=3.6
+distribute>=0.6.24
+hp3parclient>=1.0.0
+mock>=0.8.0
 mox>=0.5.3
+mysql-python
 nose
+nosehtmloutput>=0.0.3
 nosexcover
-openstack.nose_plugin
-nosehtmloutput
+openstack.nose_plugin>=0.7
 pep8==1.3.3
+psycopg2
 pylint==0.25.2
 sphinx>=1.1.2
-MySQL-python
-psycopg2
-hp3parclient>=1.0.0