Merge "organise requirements files"

requirements.txt

@@ -1,30 +1,30 @@
-pbr>=0.5.21,<1.0
-WebOb>=1.2.3,<1.3
-kombu>=2.4.8
-iso8601>=0.1.8
-argparse
-SQLAlchemy>=0.7.8,<=0.7.99
-sqlalchemy-migrate>=0.8.2
 alembic>=0.4.1
-netaddr>=0.7.6
-MySQL-python
-pymongo>=2.4
-eventlet>=0.13.0
 anyjson>=0.3.3
+argparse
+eventlet>=0.13.0
 Flask>=0.10,<1.0
-pecan>=0.2.0
-stevedore>=0.12
-msgpack-python
-python-glanceclient>=0.9.0
-python-novaclient>=2.15.0
-python-keystoneclient>=0.4.1
-python-ceilometerclient>=1.0.6
-python-swiftclient>=1.5
+happybase>=0.4
+iso8601>=0.1.8
+kombu>=2.4.8
 lockfile>=0.8
 lxml>=2.3
+msgpack-python
+MySQL-python
+netaddr>=0.7.6
+oslo.config>=1.2.0
+pbr>=0.5.21,<1.0
+pecan>=0.2.0
+pymongo>=2.4
+python-ceilometerclient>=1.0.6
+python-glanceclient>=0.9.0
+python-keystoneclient>=0.4.1
+python-novaclient>=2.15.0
+python-swiftclient>=1.5
+PyYAML>=3.1.0
 requests>=1.1
 six>=1.4.1
+SQLAlchemy>=0.7.8,<=0.7.99
+sqlalchemy-migrate>=0.8.2
+stevedore>=0.12
+WebOb>=1.2.3,<1.3
 WSME>=0.5b6
-PyYAML>=3.1.0
-oslo.config>=1.2.0
-happybase>=0.4

test-requirements.txt

@@ -1,22 +1,22 @@
-pep8==1.4.5
-pyflakes>=0.7.2,<0.7.4
-flake8==2.0
-hacking>=0.8.0,<0.9
+Babel>=1.3
 coverage>=3.6
 discover
+fixtures>=0.3.14
+flake8==2.0
+hacking>=0.8.0,<0.9
 httplib2
+http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
 mock>=1.0
 mox>=0.5.3
-fixtures>=0.3.14
-Babel>=1.3
-http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
+pep8==1.4.5
+pyflakes>=0.7.2,<0.7.4
 swift
 # Docs Requirements
-sphinx>=1.1.2
-sphinxcontrib-pecanwsme>=0.5
 docutils==0.9.1
 oslo.sphinx
 python-subunit
+sphinx>=1.1.2
+sphinxcontrib-pecanwsme>=0.5
 testrepository>=0.0.17
-testtools>=0.9.32
 testscenarios>=0.4
+testtools>=0.9.32