From 642783c98d917465d32dcf8f925c3813b6506d7f Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 10 Feb 2016 21:54:25 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I7347d8c36ab59ca61e95c4001693c25a8c2642ef
---
 requirements.txt      | 4 ++--
 setup.py              | 3 +--
 test-requirements.txt | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e9a0630..39a601e 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.11,<2.0
+pbr>=1.6 # Apache-2.0
 
-diskimage-builder>=0.1.45
\ No newline at end of file
+diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1,>=1.1.2 # Apache-2.0
diff --git a/setup.py b/setup.py
index 7363757..782bb21 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");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 6cc778c..591de09 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 bashate>=0.2 # Apache-2.0
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0  # Apache-2.0
\ No newline at end of file
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0