Merge "Updated from global requirements"

requirements.txt

@@ -1,4 +1,4 @@
-pbr>=0.5.16,<0.6
+pbr>=0.5.21,<1.0
 argparse
 iso8601>=0.1.4
 PrettyTable>=0.6,<0.8

setup.py

@@ -18,5 +18,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr>=0.5.20'],
+    setup_requires=['pbr>=0.5.21,<1.0'],
     pbr=True)

test-requirements.txt

@@ -1,13 +1,9 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
 hacking>=0.5.6,<0.7
 
 coverage>=3.6
 discover
 fixtures>=0.3.12
-keyring
+keyring>=1.6.1
 mock>=0.8.0
 sphinx>=1.1.2
 testrepository>=0.0.17