From 2aa1dc6ca3a949b71e648bcb1b24d4cd543dfbb2 Mon Sep 17 00:00:00 2001
From: OpenStack Jenkins <jenkins@openstack.org>
Date: Tue, 1 Oct 2013 16:14:29 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I81e3d4bf4eef833b0b55d17e2a55028972ea4b55
---
 requirements.txt      |  8 ++++----
 setup.py              |  7 +++----
 test-requirements.txt | 14 +++++++-------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 38a138ef1..45b0ec39f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
-oslo.config
-stevedore
+oslo.config>=1.2.0
+stevedore>=0.10
 
 # for timeutils
-iso8601
+iso8601>=0.1.4
 
 # for jsonutils
 six
 
 # FIXME(markmc): remove this when the drivers no longer
 # import eventlet
-eventlet>=0.12.0
+eventlet>=0.13.0
diff --git a/setup.py b/setup.py
index 1b05d12f5..70c2b3f32 100644
--- a/setup.py
+++ b/setup.py
@@ -14,10 +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(
-    namespace_packages=['oslo'],
-    packages=['oslo', 'oslo.messaging'],
-    setup_requires=['d2to1', 'pbr'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 25f16eb07..8ff71b54d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,16 +1,16 @@
 # Install bounded pep8/pyflakes first, then let flake8 install
 pep8==1.4.5
-pyflakes==0.7.2
+pyflakes>=0.7.2,<0.7.4
 flake8==2.0
 hacking>=0.5.6,<0.8
 
 discover
-fixtures>=0.3.12
+fixtures>=0.3.14
 mox>=0.5.3
 python-subunit
-testrepository>=0.0.13
-testscenarios<0.5
-testtools>=0.9.29
+testrepository>=0.0.17
+testscenarios>=0.4
+testtools>=0.9.32
 
 # for test_rabbit
 kombu>=2.4.8
@@ -18,8 +18,8 @@ kombu>=2.4.8
 # when we can require tox>= 1.4, this can go into tox.ini:
 #  [testenv:cover]
 #  deps = {[testenv]deps} coverage
-coverage
+coverage>=3.6
 
 # this is required for the docs build jobs
-sphinx
+sphinx>=1.1.2
 oslo.sphinx