Updated from global requirements

Change-Id: I71428e112831f569e0602e90b9d5c203e6d7fdc0

3 files changed, 11 insertions, 12 deletions

diff --git a/requirements.txt b/requirements.txt
index 843ed04..bb658bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
 # 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.
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 argparse
 requests>=2.5.2
 six>=1.9.0
 python-keystoneclient>=1.6.0
-cliff>=1.10.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
+cliff>=1.13.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 7363757..056c16c 100644
--- a/setup.py
+++ b/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");
diff --git a/test-requirements.txt b/test-requirements.txt
index 036e2f9..963c439 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,15 +3,15 @@
 # process, which may cause wedges in the gate later.
 coverage>=3.6
 discover
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 fixtures>=0.3.14
-requests-mock>=0.6.0  # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
 mock>=1.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
-oslotest>=1.5.1  # Apache-2.0
+testtools>=1.4.0
+oslotest>=1.5.1 # Apache-2.0
 nose
 
 # Documentation build 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