From bc11bb419f7934cd888f24b575bc6a24716fd18c Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 19 Oct 2013 10:51:20 -0400
Subject: [PATCH] Remove use of d2to1

Update with the global OpenStack requirements in the process.

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

diff --git a/requirements.txt b/requirements.txt
index 3114eb0..0723b91 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
+pbr>=0.5.21,<1.0
 
-paramiko
+paramiko>=1.8.0
diff --git a/setup.py b/setup.py
index 59a0090..70c2b3f 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'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 8b2c2da..f0dd00b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.8