From e614643b0863f324091f140033886c0e78e5b008 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 30 Sep 2013 11:20:08 -0400
Subject: [PATCH] Sync with global requirements

And more importantly, get rid of d2to1 references.

Skipped test-requirements because of webtest and I need the d2to1 change
in.

Closes-Bug: 1233362
Change-Id: I570fed1de8b9fbef168cf1ecfc6f62ae842820e1
---
 requirements.txt | 21 ++++++++++-----------
 setup.py         |  5 +++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 69678fb591..9679678e32 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,19 @@
 # keystone dependencies
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
+pbr>=0.5.21,<1.0
 pam>=0.1.4
-WebOb>=1.0.8
-eventlet
-greenlet
+WebOb>=1.2.3,<1.3
+eventlet>=0.13.0
+greenlet>=0.3.2
 netaddr
-PasteDeploy
-paste
-routes
-sqlalchemy>=0.7.8,<=0.7.9
+PasteDeploy>=1.5.0
+Paste
+Routes>=1.12.3
+SQLAlchemy>=0.7.8,<=0.7.99
 sqlalchemy-migrate>=0.7.2
 passlib
-lxml
+lxml>=2.3
 iso8601>=0.1.4
-python-keystoneclient>=0.3.0
+python-keystoneclient>=0.3.2
 oslo.config>=1.2.0
 Babel>=0.9.6
 oauth2
diff --git a/setup.py b/setup.py
index 3144d17a05..70c2b3f32b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1', 'pbr>=0.5,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)