Updated from global requirements

Change-Id: I366d76024a45835407f1b8741e27c3f4a0ac4d0d

requirements.txt

@@ -1,10 +1,10 @@
 # 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.
-cliff>=1.10.0  # Apache-2.0
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
+cliff>=1.13.0 # Apache-2.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
 oslo.utils>=1.6.0 # Apache-2.0
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 python-keystoneclient>=1.6.0
 requests>=2.5.2
 six>=1.9.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

@@ -2,13 +2,13 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.9.2,<0.10
+hacking<0.10,>=0.9.2
 coverage>=3.6
 mock>=1.0
 discover
 oslotest>=1.5.1 # Apache-2.0
 python-subunit>=0.0.18
 requests-mock>=0.6.0 # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
 oslosphinx>=2.5.0 # Apache-2.0