Remove d2to1 dependency

Change-Id: I9e91070e61e00cbc7d99ff223e85c3c371f60566

tools/install_venv.py

@@ -54,8 +54,8 @@ def print_help():
 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')
-    test_requires = os.path.join(root, 'tools', 'test-requires')
+    pip_requires = os.path.join(root, 'requirements.txt')
+    test_requires = os.path.join(root, 'test-requirements.txt')
     project = 'Manila'
     py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,

tools/patch_tox_venv.py

@@ -25,8 +25,8 @@ def main(argv):
 
     venv = os.environ['VIRTUAL_ENV']
 
-    pip_requires = os.path.join(root, 'tools', 'pip-requires')
-    test_requires = os.path.join(root, 'tools', 'test-requires')
+    pip_requires = os.path.join(root, 'requirements.txt')
+    test_requires = os.path.join(root, 'test-requirements.txt')
     py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
     project = 'manila'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,

tools/pip-requires

@@ -1,26 +0,0 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
-amqplib>=0.6.1
-anyjson>=0.2.4
-argparse
-babel>=0.9.6
-eventlet>=0.9.12
-greenlet>=0.3.1
-iso8601>=0.1.4
-kombu>=1.0.4
-lockfile>=0.8
-lxml>=2.3
-oslo.config>=1.1.0
-paramiko>=1.8.0
-paste
-pastedeploy>=1.5.0
-python-glanceclient>=0.5.0,<2
-python-keystoneclient>=0.2,<0.3
-python-swiftclient>=1.2,<2
-routes>=1.12.3
-sqlalchemy>=0.7,<=0.7.99
-sqlalchemy-migrate>=0.7
-stevedore>=0.7
-suds>=0.4
-webob>=1.0.8
-wsgiref>=0.1.2

tools/test-requires

@@ -1,18 +0,0 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.3,<0.6
-
-coverage>=3.6
-distribute>=0.6.24
-hp3parclient>=1.0.0
-mock>=0.8.0
-mox>=0.5.3
-mysql-python
-nose
-nosehtmloutput>=0.0.3
-nosexcover
-openstack.nose_plugin>=0.7
-psycopg2
-sphinx>=1.1.2