Updated from global requirementskilo-eolstable/kilo

Change-Id: Id65c81f9e34fad50dfc2301bb9943384fa972e56

3 files changed, 8 insertions, 9 deletions

diff --git a/requirements.txt b/requirements.txt
index 61d35e1..3c512f3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,12 +7,12 @@
 # adding a new feature to oslo.serialization means adding a new dependency,
 # that is a likely indicator that the feature belongs somewhere else.
 
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 Babel>=1.3
 six>=1.9.0
 msgpack-python>=0.4.0
 # Only for timeutils in openstack.common - once we're using the
 # library version this can be removed.
 iso8601>=0.1.9
-oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
 pytz>=2013.6
diff --git a/setup.py b/setup.py
index 7363757..056c16c 100755..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 d299c5e..280b77a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,15 +1,15 @@
 # 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.10.0,<0.11
-mock>=1.0
+hacking<0.11,>=0.10.0
+mock<1.1.0,>=1.0
 netaddr>=0.7.12
 
 # this is required for the docs build jobs
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
 
-oslotest>=1.5.1,<1.6.0  # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
 simplejson>=2.2.0
-oslo.i18n>=1.5.0,<1.6.0  # Apache-2.0
+oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
 coverage>=3.6