From 629e54879838e245b9206683cdd68ae41a9bee6a Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Fri, 24 Jul 2015 03:34:55 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index fa300b9c4..ff94afbd6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # 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.3
 argparse
 PrettyTable<0.8,>=0.7
 python-keystoneclient>=1.6.0
diff --git a/setup.py b/setup.py
index 056c16c2b..d8080d05c 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 c7c16b4cb..7df482fac 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,7 @@ hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 fixtures>=1.3.1
-mock>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 oslosphinx>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18
 requests-mock>=0.6.0 # Apache-2.0