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

Change-Id: I9e91070e61e00cbc7d99ff223e85c3c371f60566
---
 doc/source/devref/development.environment.rst | 2 +-
 doc/source/devref/unit_tests.rst              | 2 +-
 tools/pip-requires => requirements.txt        | 3 +--
 setup.py                                      | 4 ++--
 tools/test-requires => test-requirements.txt  | 0
 tools/install_venv.py                         | 4 ++--
 tools/patch_tox_venv.py                       | 4 ++--
 tox.ini                                       | 6 +++---
 8 files changed, 12 insertions(+), 13 deletions(-)
 rename tools/pip-requires => requirements.txt (92%)
 rename tools/test-requires => test-requirements.txt (100%)

diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index d6c0b78393..6632c2f300 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -121,7 +121,7 @@ You can manually install the virtual environment instead of having
   python tools/install_venv.py
 
 This will install all of the Python packages listed in the
-``tools/pip-requires`` file into your virtualenv. There will also be some
+``requirements.txt`` file into your virtualenv. There will also be some
 additional packages (pip, distribute, greenlet) that are installed
 by the ``tools/install_venv.py`` file into the virutalenv.
 
diff --git a/doc/source/devref/unit_tests.rst b/doc/source/devref/unit_tests.rst
index 8d209db940..8380f9463f 100644
--- a/doc/source/devref/unit_tests.rst
+++ b/doc/source/devref/unit_tests.rst
@@ -100,7 +100,7 @@ If you wish to recreate the virtualenv, call ``run_tests.sh`` with the flag::
     -f, --force
 
 Recreating the virtualenv is useful if the package dependencies have changed
-since the virtualenv was last created. If the ``tools/pip-requires`` or
+since the virtualenv was last created. If the ``requirements.txt`` or
 ``tools/install_venv.py`` files have changed, it's a good idea to recreate the
 virtualenv.
 
diff --git a/tools/pip-requires b/requirements.txt
similarity index 92%
rename from tools/pip-requires
rename to requirements.txt
index 16d81277d4..c0b12b649b 100644
--- a/tools/pip-requires
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
+pbr>=0.5.21,<1.0
 amqplib>=0.6.1
 anyjson>=0.2.4
 argparse
diff --git a/setup.py b/setup.py
index 1e9882df0e..c0a24eab2a 100644
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)
diff --git a/tools/test-requires b/test-requirements.txt
similarity index 100%
rename from tools/test-requires
rename to test-requirements.txt
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 31daf63f81..eb40a86798 100644
--- a/tools/install_venv.py
+++ b/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,
diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py
index fde2cd86cb..905d23e449 100644
--- a/tools/patch_tox_venv.py
+++ b/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,
diff --git a/tox.ini b/tox.ini
index f5b52fc1f9..9e53c0232d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ setenv = VIRTUAL_ENV={envdir}
          LANGUAGE=en_US:en
          LC_ALL=C
 
-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands =
   python tools/patch_tox_venv.py
   nosetests {posargs}
@@ -32,7 +32,7 @@ setenv = NOSE_WITH_COVERAGE=1
 
 [testenv:pylint]
 setenv = VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/tools/pip-requires
+deps = -r{toxinidir}/requirements.txt
        pylint==0.26.0
 commands = bash tools/lintstack.sh