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

Change-Id: I95c10665bf2846a82c8fc4e161b4c968e1ad6f4f
---
 requirements.txt |  3 +--
 setup.py         | 23 ++---------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 68b462be..6ea0d821 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
 SQLAlchemy>=0.7.8,<0.7.99
 amqplib>=0.6.1
 anyjson>=0.2.4
diff --git a/setup.py b/setup.py
index 5f6c0f61..c0a24eab 100644
--- a/setup.py
+++ b/setup.py
@@ -16,25 +16,6 @@
 
 import setuptools
 
-from tuskar.openstack.common import setup as common_setup
-
-project = 'tuskar'
-
 setuptools.setup(
-    name=project,
-    version=common_setup.get_version(project, '2013.1'),
-    description='An OpenStack Management Service',
-    classifiers=[
-        'Environment :: OpenStack',
-        'Intended Audience :: Information Technology',
-        'Intended Audience :: System Administrators',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        ],
-    include_package_data=True,
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
-    d2to1=True,
-)
+    setup_requires=['pbr'],
+    pbr=True)