From 9284eb42539630d6f46255a7ca10d7a718dc5f25 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 10 Aug 2015 01:10:04 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index cdc8c89..cadd221 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
 # 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.
-pbr<2.0,>=0.11
+pbr<2.0,>=1.4
 Babel>=1.3
 argparse
 PrettyTable<0.8,>=0.7
 python-keystoneclient>=1.6.0
-pyOpenSSL>=0.11
+pyOpenSSL>=0.14
 requests>=2.5.2
 warlock<2,>=1.0.1
 six>=1.9.0
-oslo.utils>=1.6.0 # Apache-2.0
+oslo.utils>=1.9.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 056c16c..d8080d0 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index dcdd38e..b7279bb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,12 +1,11 @@
 # 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
+hacking<0.11,>=0.10.0
 
 coverage>=3.6
 discover
-mock>=1.0;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 oslosphinx>=2.5.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18