From c9ee415228d536c3e24bb8273ec8ce346c29ac12 Mon Sep 17 00:00:00 2001
From: Yves-Gwenael Bourhis <yves-gwenael.bourhis@cloudwatt.com>
Date: Tue, 29 Mar 2016 11:21:31 +0200
Subject: [PATCH] Update requirements

flame could not install with curent supported version of openstack because the
requirements where conflicting with https://github.com/openstack/requirements

Updated requirements.txt and tes-requirements.txt to match openstack's
global requirements.

Change-Id: I7dd0ba588569922d43d0282183d86c82e5e9b7fc
---
 requirements.txt      |  4 ++--
 test-requirements.txt | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 3424d19..a007723 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
-pbr>=0.6,!=0.7,<1.0
+pbr>=1.6
 Babel>=1.3
 
-netaddr>=0.7.12
+netaddr>=0.7.12,!=0.7.16
 python-keystoneclient
 python-neutronclient
 python-novaclient
diff --git a/test-requirements.txt b/test-requirements.txt
index 27ae44c..c7fbc6c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,12 +1,12 @@
-hacking>=0.9.2,<0.10
+hacking>=0.10.2,<0.11
 
 coverage>=3.6
 discover
-mock>=1.0
-fixtures>=0.3.14
+mock>=1.2
+fixtures>=1.3.1
 python-subunit
-sphinx>=1.1.2
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 oslosphinx
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.34
+testtools>=1.4.0