Updated from global requirements

Change-Id: If8c4873d1ef925f6454358843cbeb3b2d0077bc5

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

setup.py

@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)

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