From 4608a84aabc3653867361861a22e5056137a6505 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 30 Sep 2013 10:53:48 -0400
Subject: [PATCH] Remove d2to1 dependency

Change-Id: I91d6cbd3473382f5559bdcaf49597e7d004af74d
---
 requirements.txt |  5 ++---
 setup.py         | 33 ++++++++++++++-------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 52d43e97b..1bfa9644f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
+pbr>=0.5.21,<1.0
 Babel
 SQLAlchemy>=0.7.5,<=0.7.9
 anyjson
@@ -31,4 +30,4 @@ passlib
 jsonschema==2.0.0
 python-keystoneclient>=0.2.0
 oslo.config
-murano-common>=0.2.2
\ No newline at end of file
+murano-common>=0.2.2
diff --git a/setup.py b/setup.py
index 07fba76d0..c0a24eab2 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,
-)
+    setup_requires=['pbr'],
+    pbr=True)