Updated from global requirementskilo-eolstable/kilo

Change-Id: I9eb2994196f12f40e644cadb83b1c1fab8f055bc

3 files changed, 5 insertions, 6 deletions

diff --git a/requirements.txt b/requirements.txt
index f7f4cc9..3db9953 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 argparse
 six>=1.9.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 6075428..16d956b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,10 +3,10 @@
 # process, which may cause wedges in the gate later.
 
 Pillow==2.4.0 # MIT
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-mock>=1.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+mock<1.1.0,>=1.0
 coverage>=3.6
 testrepository>=0.0.18
 discover
-oslotest>=1.2.0  # Apache-2.0
-oslosphinx>=2.2.0  # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0