From 60b1928075033ef03966773c1d851407770ead0d Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 13 Aug 2013 13:34:10 -0300
Subject: [PATCH] Align with openstack requirements

Change-Id: I8f9b2743d507c39034ae4b2208731f0515c6e106
---
 requirements.txt      | 6 +++---
 setup.py              | 5 +++--
 test-requirements.txt | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a9f8240..0b57677 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-anyjson
+pbr>=0.5.21,<1.0
+
+anyjson>=0.3.3
 argparse
-d2to1
-pbr
 pystache
diff --git a/setup.py b/setup.py
index 59a0090..2a0786a 100644
--- 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', 'pbr'],
-    d2to1=True)
+    setup_requires=['pbr>=0.5.21,<1.0'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index d174dfb..138493d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,9 +1,10 @@
+hacking>=0.5.6,<0.7
+
 coverage>=3.6
 discover
 fixtures>=0.3.12
-hacking
 python-subunit
 sphinx>=1.1.2
-testrepository>=0.0.13
-testscenarios
-testtools>=0.9.27
+testrepository>=0.0.17
+testscenarios>=0.4,<0.5
+testtools>=0.9.32