Sync with global requirements

And fix (new) H231: Python 3.x incompatible 'except x,y:' construct

Change-Id: I7c4adba2ea0618c4ad66bdc9f316af6159567261

requirements.txt

@@ -1,22 +1,22 @@
 pbr>=0.5.21,<1.0
-SQLAlchemy>=0.7.8,<0.7.99
+SQLAlchemy>=0.7.8,<=0.7.99
 amqplib>=0.6.1
-anyjson>=0.2.4
+anyjson>=0.3.3
 argparse
-eventlet>=0.9.17
-kombu>=1.0.4
+eventlet>=0.13.0
+kombu>=2.4.8
 lxml>=2.3
-WebOb==1.2.3
-greenlet>=0.3.1
-sqlalchemy-migrate>=0.7.2
-Babel>=0.9.6
-iso8601>=0.1.4
+WebOb>=1.2.3,<1.3
+greenlet>=0.3.2
+sqlalchemy-migrate>=0.8.2
+Babel>=1.3
+iso8601>=0.1.8
 setuptools_git>=0.4
-python-keystoneclient>=0.2.0
-oslo.config>=1.1.0
-Flask==0.9
+python-keystoneclient>=0.4.1
+oslo.config>=1.2.0
+Flask>=0.10,<1.0
 pecan>=0.2.0
-WSME>=0.5b5
-python-novaclient
+WSME>=0.5b6
+python-novaclient>=2.15.0
 PyYAML>=3.1.0
-python-heatclient
+python-heatclient>=0.2.3

test-requirements.txt

@@ -1,13 +1,13 @@
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.5.3,<0.6
+hacking>=0.8.0,<0.9
 
 coverage>=3.6
 discover
-fixtures>=0.3.12
-mox==0.5.3
+fixtures>=0.3.14
+mox>=0.5.3
 MySQL-python
 python-subunit
-sphinx>=1.1.2
-testrepository>=0.0.13
-testtools>=0.9.27
+sphinx>=1.1.2,<1.2
+testrepository>=0.0.17
+testtools>=0.9.32
 unittest2

tuskar/db/sqlalchemy/api.py

@@ -329,7 +329,7 @@ class Connection(api.Connection):
             session.commit()
             return overcloud
 
-        except db_exception.DBDuplicateEntry, e:
+        except db_exception.DBDuplicateEntry as e:
             if 'name' in e.columns:
                 raise exception.OvercloudExists(name=overcloud.name)
             else: