From 05f1fd473330cb130b87589b389b583c13b4931a Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 30 Sep 2013 10:34:10 -0400
Subject: [PATCH] Remove d2to dependency

Change-Id: I1bcbbe8aa7ae579b6d4afa517dd40a8132cab7bc
---
 requirements.txt |  2 +-
 setup.py         | 33 ++++++++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9f9a005..e170316 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pbr>=0.5,<0.6
+pbr>=0.5.21,<1.0
 anyjson
 eventlet>=0.9.12
 jsonpath
diff --git a/setup.py b/setup.py
index d0f89e4..c0a24ea 100644
--- a/setup.py
+++ b/setup.py
@@ -1,26 +1,21 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
-#    Copyright (c) 2013 Mirantis, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import setuptools
 
 setuptools.setup(
-    setup_requires=[
-        'd2to1>=0.2.10,<0.3',
-        'pbr>=0.5,<0.6'
-    ],
-    d2to1=True,
-    pbr=True
-)
+    setup_requires=['pbr'],
+    pbr=True)