Updated from global requirements

Change-Id: I2745d042fbb91ee4e068ab55f7c7214036d5a834

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.7.0  # Apache-2.0
-jsonschema>=2.0.0,<3.0.0
-pbr>=0.6,!=0.7,<1.0
-python-keystoneclient>=0.11.1
-requests>=2.2.0,!=2.4.0
-six>=1.7.0
-stevedore>=1.1.0  # Apache-2.0
+cliff>=1.14.0 # Apache-2.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
+pbr<2.0,>=1.4
+python-keystoneclient>=1.6.0
+requests>=2.5.2
+six>=1.9.0
+stevedore>=1.5.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");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)

test-requirements.txt

@@ -2,15 +2,15 @@
 # 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
 discover
-fixtures>=0.3.14
-mock>=1.0
-requests-mock>=0.6.0
+fixtures>=1.3.1
+mock>=1.2
+requests-mock>=0.6.0 # Apache-2.0
 python-subunit>=0.0.18
 testrepository>=0.0.18
 
 # Doc requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0  # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx>=2.5.0 # Apache-2.0