From d079e8ec6f744a0c63ae9ef32219d92bf8db102d Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 7 Aug 2013 19:21:21 -0300
Subject: [PATCH] Updated from global requirements

Change-Id: I2ce6d9920f25ce41cb0ef569534a25beb9f363aa
---
 requirements.txt      | 31 +++++++++++++++----------------
 setup.py              |  5 +++--
 test-requirements.txt | 19 ++++++++-----------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 69ddc8c8b..c08e2d2f0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,30 +1,29 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
-WebOb>=1.2
-kombu>2.4.7
-iso8601
+pbr>=0.5.21,<1.0
+WebOb>=1.2.3,<1.3
+kombu>=2.4.8
+iso8601>=0.1.4
 argparse
-SQLAlchemy>=0.7,<=0.7.99
+SQLAlchemy>=0.7.8,<=0.7.99
 sqlalchemy-migrate>=0.7.2
 alembic>=0.4.1
 netaddr
 pymongo>=2.4
-eventlet
+eventlet>=0.13.0
 anyjson>=0.3.3
 Flask==0.9
 pecan>=0.2.0
-stevedore>=0.9
+stevedore>=0.10
 msgpack-python
-python-glanceclient
-python-novaclient>=2.6.10
+python-glanceclient>=0.9.0
+python-novaclient>=2.12.0
 python-keystoneclient>=0.3.0
-python-ceilometerclient>=1.0.1
-python-swiftclient
-lxml
-requests>=1.1,<1.2.1
+python-ceilometerclient>=1.0.2
+python-swiftclient>=1.2
+lxml>=2.3
+requests>=1.1
 six
-wsme>=0.5b2
-pyyaml
+WSME>=0.5b2
+PyYAML>=3.1.0
 -f http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3
 oslo.config>=1.2.0a3
 happybase>=0.4
diff --git a/setup.py b/setup.py
index 1e9882df0..2a0786a8b 100755
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr>=0.5.21,<1.0'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index bb91f9889..036c90bc8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,24 +2,21 @@ pep8==1.4.5
 pyflakes==0.7.2
 flake8==2.0
 hacking>=0.5.6,<0.7
-coverage
+coverage>=3.6
 discover
 httplib2
-mock
-mox
+mock>=1.0
+mox>=0.5.3
 fixtures>=0.3.12
 Babel>=0.9.6
 http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
-# We should use swift>1.7.5, but it's not yet available
 swift
-# Swift dep that is not necessary if we depend on swift>1.7.5
-netifaces
 # Docs Requirements
-sphinx
+sphinx>=1.1.2
 sphinxcontrib-pecanwsme>=0.2
-docutils==0.9.1 # for bug 1091333, remove after sphinx >1.1.3 is released.
+docutils==0.9.1
 oslo.sphinx
 python-subunit
-testrepository>=0.0.13
-testtools>=0.9.29
-testscenarios<0.5
+testrepository>=0.0.17
+testtools>=0.9.32
+testscenarios>=0.4,<0.5