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

Change-Id: I0ddd70f642db7ef45ada5baa72de0531f1b03b7d
---
 requirements.txt |  5 ++---
 setup.py         | 12 ++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4479985..9fc8146 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
 anyjson
 eventlet>=0.9.12
-https://github.com/istalker2/puka/releases/download/1.0.7c/puka-1.0.7c.tar.gz#egg=puka-1.0.7c
\ No newline at end of file
+https://github.com/istalker2/puka/releases/download/1.0.7c/puka-1.0.7c.tar.gz#egg=puka-1.0.7c
diff --git a/setup.py b/setup.py
index 4ab57a1..c0a24ea 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2013 Mirantis Inc.
+#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,6 @@
 
 import setuptools
 
-
 setuptools.setup(
-    setup_requires=[
-        'd2to1>=0.2.10,<0.3',
-        'pbr>=0.5,<0.6'
-    ],
-    d2to1=True
-)
+    setup_requires=['pbr'],
+    pbr=True)