From 88ce5ec96273b980b81a8f3bf46333e908af52d1 Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Mon, 27 Apr 2015 14:13:40 -0400
Subject: [PATCH] Update requirements and test-requirements

Update the requirements and test-requirements files to match with
global-requirements. A hacking update will be performed in a
separate commit.

Change-Id: I3fb976c00fe97378cbe1e2291a911be755254e41
---
 requirements.txt      |  2 +-
 test-requirements.txt | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 48e5e5d2..91758cff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pbr>=0.5.21,<1.0
+pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
 PyYAML>=3.1.0
 python_dateutil>=2.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 687350a8..8873881d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,10 +2,10 @@ hacking>=0.5.6,<0.8
 coverage>=3.6
 discover
 fixtures>=0.3.14
-oslotest>=1.2.0 # Apache-2.0
+oslotest>=1.5.1  # Apache-2.0
 oslosphinx>=2.5.0  # Apache-2.0
-python-subunit
-sphinx>=1.1.2
-testrepository>=0.0.17
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
+python-subunit>=0.0.18
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+testrepository>=0.0.18
+testscenarios>=0.4
+testtools>=0.9.36,!=1.2.0