Merge "Remove usage of d2to1"

2013-10-02 22:39:51 +00:00 · 2013-10-02 22:39:51 +00:00 · e3b58d207e
parent 1fdc3d8fe8 52905bcdd3
commit e3b58d207e
3 changed files with 3 additions and 8 deletions
--- 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

 argparse
 PyYAML
--- a/setup.cfg
+++ b/setup.cfg
@ -19,10 +19,6 @@ classifier =
 [pbr]
 warnerrors = True

-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
    zuul-server = zuul.cmd.server:main
--- a/setup.py
+++ b/setup.py
@ -17,5 +17,5 @@
 import setuptools

 setuptools.setup(
-    setup_requires=['d2to1', 'pbr'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)