Merge "Remove d2to dependency"

requirements.txt

@@ -1,12 +1,12 @@
+pbr>=0.5.21,<1.0
+
 argparse
 cheetah>=2.4.4
-d2to1>=0.2.10,<0.3
 iniparse
 iso8601>=0.1.4
 keyring>=1.6.1,<2.0
 netifaces>=0.5
 ordereddict
-pbr>=0.5.16,<0.6
 progressbar
 psutil
 pyyaml>=3.1.0

setup.py

@@ -1,24 +1,21 @@
-# Copyright 2011 OpenStack Foundation
+#!/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.
 # 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.
+# 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)