Updated from global requirements

Change-Id: I496909e3f6fed962c8443d13453ef8e9382744ae

requirements.txt

@@ -6,38 +6,38 @@ boto>=2.32.1
 decorator>=3.4.0
 fixtures>=0.3.14
 iso8601>=0.1.9
-Jinja2>=2.6  # BSD License (3 clause)
-jsonschema>=2.0.0,<3.0.0
+Jinja2>=2.6 # BSD License (3 clause)
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
 netaddr>=0.7.12
-oslo.config>=1.11.0  # Apache-2.0
-oslo.db>=1.10.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.4.0                       # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.db>=1.10.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 paramiko>=1.13.0
-pbr>=0.11,<2.0
-PrettyTable>=0.7,<0.8
+pbr<2.0,>=0.11
+PrettyTable<0.8,>=0.7
 PyYAML>=3.1.0
 psycopg2
 python-designateclient>=1.0.0
-python-glanceclient>=0.17.1
+python-glanceclient>=0.18.0
 python-keystoneclient>=1.6.0
 python-novaclient>=2.22.0
-python-neutronclient>=2.3.11,<3
-python-cinderclient>=1.2.1
+python-neutronclient<3,>=2.3.11
+python-cinderclient>=1.2.2
 python-manilaclient>=1.0.4
 python-heatclient>=0.3.0
 python-ceilometerclient>=1.0.13
 python-ironicclient>=0.2.1
 python-saharaclient>=0.9.0
-python-troveclient>=1.0.7
+python-troveclient>=1.0.9
 python-zaqarclient>=0.1.1
 python-swiftclient>=2.2.0
 python-subunit>=0.0.18
 requests>=2.5.2
-SQLAlchemy>=0.9.7,<=0.9.99
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+SQLAlchemy<1.1.0,>=0.9.7
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 six>=1.9.0
 
 # Python 2.6 related packages(see rally.common.costilius for more details)

setup.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,7 @@
 # implied.
 # 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
 

test-requirements.txt

@@ -1,14 +1,14 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=0.9.2,<0.10
+hacking<0.10,>=0.9.2
 
 coverage>=3.6
 ddt>=0.7.0
 discover
 mock>=1.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 
-oslosphinx>=2.5.0  # Apache-2.0
-oslotest>=1.5.1  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0