Sync requirements with openstack/requirements (except jsonschema)

Change-Id: Ie00dea1c9f9ef30776939d0821bfb3784994f5bf

requirements.txt

@@ -1,23 +1,19 @@
+# This file is managed by openstack-depends
+cliff>=1.4
 d2to1>=0.2.10,<0.3
-pbr>=0.5.10,<0.6
-flask==0.9
 eventlet>=0.9.12
-jsonschema>=0.8,<1
+extras
+flask==0.9
 ipaddr
+iso8601>=0.1.4
+jsonschema>=0.8,<1
+kombu>2.4.7
 paste
 pastedeploy>=1.5.0
-stevedore>=0.7
-cliff>=1.3.1
-
+pbr>=0.5.16,<0.6
+python-keystoneclient>=0.2,<0.3
+routes>=1.12.3
 sqlalchemy>=0.7,<=0.7.99
 sqlalchemy-migrate>=0.7
-kombu
-
-# Needed for Keystone Middleware
-python-keystoneclient>=0.2,<0.3
-
-# From OpenStack Common
-routes>=1.12.3
-iso8601>=0.1.4
+stevedore>=0.9
 webob>=1.0.8
-extras

test-requirements.txt

@@ -1,18 +1,13 @@
-# Packages needed for dev testing
-distribute>=0.6.24
-
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
+# This file is managed by openstack-depends
+coverage>=3.6
 flake8==2.0
 hacking>=0.5.3,<0.6
-
-coverage>=3.6
-nosexcover
-
-nose
-openstack.nose_plugin>=0.7
-nosehtmloutput>=0.0.3
-unittest2
-mox>=0.5.3
 mock>=0.8.0
+mox>=0.5.3
+nose
+nosehtmloutput>=0.0.3
+nosexcover
+openstack.nose_plugin>=0.7
+pep8==1.4.5
+pyflakes==0.7.2
+unittest2