Remove d2to dependency

Change-Id: I433711ba417dbb15f616fa488cec389f3138b00a

setup.py

@@ -1,4 +1,5 @@
-# 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.
@@ -8,17 +9,13 @@
 #
 # 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=[
+    setup_requires=['pbr'],
-        'd2to1>=0.2.10,<0.3',
+    pbr=True)
-        'pbr>=0.5,<0.6'
-    ],
-    d2to1=True
-)

tools/install_venv.py

@@ -55,8 +55,8 @@ Also, make test will automatically use the virtualenv.
 def main(argv):
     root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
     venv = os.path.join(root, '.venv')
-    pip_requires = os.path.join(root, 'tools', 'pip-requires')
+    pip_requires = os.path.join(root, 'requirements.txt')
-    test_requires = os.path.join(root, 'tools', 'test-requires')
+    test_requires = os.path.join(root, 'test-requirements.txt')
     py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
     project = 'Taskflow'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,

tox.ini

@@ -1,8 +1,11 @@
 [tox]
+minversion = 1.6
+skipsdist = True
 envlist = py26,py27,py33,pep8
 
 [testenv]
-sitepackages = True
+usedevelop = True
+install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          LANG=en_US.UTF-8
          LANGUAGE=en_US:en
@@ -13,22 +16,20 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
          NOSE_OPENSTACK_STDOUT=1
-deps = -r{toxinidir}/tools/pip-requires
+deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/tools/test-requires
+       -r{toxinidir}/test-requirements.txt
 commands = nosetests {posargs}
 
 [tox:jenkins]
-sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-sitepackages = False
 commands =
   flake8 {posargs}
 
 [testenv:pylint]
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/tools/pip-requires
+deps = -r{toxinidir}/requirements.txt
        pylint==0.26.0
 commands = pylint