From 59e7414d2a1144faf5b0769000f7f3bb978a42e2 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 3 Jul 2014 14:35:04 +0000
Subject: [PATCH] Update requirements to OpenStack's recommendations

This synchronizes requirements.txt, test-requirements.txt and
setup.py with the current state of the openstack/requirements
global-requirements.txt list. Also adds flake8 exclusions to tox.ini
for new hacking rules with which git-review does not yet comply.

Change-Id: I837ba57134bea16dd46c3f512bccd51cb39f76c8
---
 requirements.txt      | 2 +-
 setup.py              | 3 +--
 test-requirements.txt | 8 ++++----
 tox.ini               | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8e98f761..e28f5fb7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 argparse
-requests
+requests>=1.1
diff --git a/setup.py b/setup.py
index ce12df35..10d670de 100755
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,4 @@
 import setuptools
 
 
-setuptools.setup(setup_requires=['pbr>=0.5.21,<1.0'],
-                 pbr=True)
+setuptools.setup(setup_requires=['pbr'], pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 8d864f31..44b948db 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
-hacking>=0.8.0,<0.9
+hacking>=0.9.2,<0.10
 discover
 
-fixtures>=0.3.14,<0.4
-testrepository>=0.0.13
-testtools>=0.9.27
+fixtures>=0.3.14
+testrepository>=0.0.18
+testtools>=0.9.34
diff --git a/tox.ini b/tox.ini
index d9a410c0..e4e8384d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,6 @@ commands = python setup.py sdist {posargs}
 commands = {posargs}
 
 [flake8]
-ignore = E125
+ignore = E125,H202,H305,H307,H405,H904
 show-source = True
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build