Updated from global requirements

Change-Id: I39d97b9c11b56f8d311b57d3a95dc41804c8f323
dan1 · Jul 18, 2015 · 85b5ffb · 85b5ffb
1 parent 49df21d
commit 85b5ffb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
 Django<1.8,>=1.4.2
 oslo.config>=1.11.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0

diff --git a/setup.py b/setup.py
@@ -25,5 +25,5 @@
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -4,7 +4,7 @@
 hacking<0.11,>=0.10.0
 Babel>=1.3
 coverage>=3.6
-mock>=1.1;python_version!='2.6'
+mock!=1.1.4,>=1.1;python_version!='2.6'
 mock==1.0.1;python_version=='2.6'
 mox3>=0.7.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2