From 72983a4a89236ec00b851b727d69c05e7e61ae51 Mon Sep 17 00:00:00 2001
From: John Griffith <john.griffith@solidfire.com>
Date: Sat, 24 Aug 2013 10:23:29 -0600
Subject: [PATCH] Sync up with global requirements

This is a pull from openstack/requirements.

Note that pep8, pyflakes and flake8 are now specified
as deps in hacking, so we can remove those here.  Also
if we don't remove them then we run into version conflicts
when hacking tries to set things up.

Quick!!!  Before it changes again!

Change-Id: Ib35b58c01f8d5d066d559e8afe4ea02adf55db5d
---
 cinder/db/sqlalchemy/migrate_repo/manage.py | 16 +++++++++++-
 requirements.txt                            | 27 ++++++++++-----------
 test-requirements.txt                       | 13 ++++------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py
index 86ef0e600..546ecf462 100644
--- a/cinder/db/sqlalchemy/migrate_repo/manage.py
+++ b/cinder/db/sqlalchemy/migrate_repo/manage.py
@@ -1,4 +1,19 @@
 #!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 OpenStack Foundation
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    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. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
 
 import os
 
@@ -8,7 +23,6 @@ from cinder.openstack.common import gettextutils
 gettextutils.install('cinder', lazy=True)
 
 from cinder.db.sqlalchemy import migrate_repo
-from cinder.openstack.common.db.sqlalchemy import session
 from cinder import version
 
 from migrate.versioning.shell import main
diff --git a/requirements.txt b/requirements.txt
index 8e8b9dae4..74f0580c5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,26 +1,25 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5.16,<0.6
+pbr>=0.5.21,<1.0
 amqplib>=0.6.1
 anyjson>=0.3.3
 argparse
-babel>=0.9.6
-eventlet>=0.12.0
+Babel>=0.9.6
+eventlet>=0.13.0
 greenlet>=0.3.2
 iso8601>=0.1.4
-kombu>2.4.7
+kombu>=2.4.8
 lockfile>=0.8
 lxml>=2.3
 oslo.config>=1.1.0
 paramiko>=1.8.0
-paste
-pastedeploy>=1.5.0
+Paste
+PasteDeploy>=1.5.0
 python-glanceclient>=0.9.0
-python-keystoneclient>=0.2.1
-python-swiftclient>=1.2
-routes>=1.12.3
+python-keystoneclient>=0.3.0
+python-swiftclient>=1.5
+Routes>=1.12.3
 six
-sqlalchemy>=0.7,<=0.7.99
-sqlalchemy-migrate>=0.7
-stevedore>=0.9
-webob>=1.2.3,<1.3
+SQLAlchemy>=0.7.8,<=0.7.99
+sqlalchemy-migrate>=0.7.2
+stevedore>=0.10
+WebOb>=1.2.3,<1.3
 wsgiref>=0.1.2
diff --git a/test-requirements.txt b/test-requirements.txt
index 98a6a6757..ffcf7bd30 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,18 +1,15 @@
 # Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.6,<0.6
+hacking>=0.5.6,<0.8
 coverage>=3.6
 discover
-fixtures>=0.3.12
+fixtures>=0.3.14
 hp3parclient>=1.0.0
-mock>=0.8.0
+mock>=1.0
 mox>=0.5.3
-mysql-python
+MySQL-python
 psycopg2
 sphinx>=1.1.2
 python-subunit
 testtools>=0.9.32
-testrepository>=0.0.15
+testrepository>=0.0.17
 oslo.sphinx
-- 
2.45.2