Updated from global requirements

Change-Id: I4d8e9524d47977e3d985f48988d1a5b1b9ae6cf0

requirements.txt

@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # See: https://bugs.launchpad.net/pbr/+bug/1384919 for why this is here...
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 
 # Packages needed for using this library.
 
@@ -32,7 +32,7 @@ stevedore>=1.5.0  # Apache-2.0
 futures>=3.0
 
 # Used for structured input validation
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
 
 # For common utilities
 oslo.utils>=1.6.0 # Apache-2.0

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");

test-requirements.txt

@@ -5,7 +5,7 @@
 hacking<0.11,>=0.10.0
 oslotest>=1.5.1 # Apache-2.0
 mock>=1.0
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 testscenarios>=0.4
 
 # Used for testing the WBE engine.
@@ -13,10 +13,10 @@ kombu>=3.0.7
 
 # Used for testing zookeeper & backends.
 zake>=0.1.6 # Apache-2.0
-kazoo>=1.3.1,!=2.1
+kazoo!=2.1,>=1.3.1
 
 # Used for testing database persistence backends.
-SQLAlchemy>=0.9.7,<1.1.0
+SQLAlchemy<1.1.0,>=0.9.7
 alembic>=0.7.2
 psycopg2
 PyMySQL>=0.6.2 # MIT License
@@ -25,5 +25,5 @@ PyMySQL>=0.6.2  # MIT License
 eventlet>=0.17.3
 
 # Docs build jobs need these packages.
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 oslosphinx>=2.5.0 # Apache-2.0