From a69e5866f8b9762c3908429e615dd59948892545 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Wed, 11 Jun 2014 01:37:23 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 253bf42..373c0b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,5 @@ pbr>=0.6,!=0.7,<1.0
 argparse
 iso8601>=0.1.9
 PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.7.0
+python-keystoneclient>=0.9.0
 six>=1.6.0
diff --git a/setup.py b/setup.py
index 70c2b3f..7363757 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,14 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
 setuptools.setup(
     setup_requires=['pbr'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 6d04138..a8333e7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,10 +1,10 @@
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
+hacking>=0.9.1,<0.10
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
-sphinx>=1.1.2,<1.2
+sphinx>=1.2.1,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34
diff --git a/tox.ini b/tox.ini
index e8a776a..175248a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,12 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 commands = {posargs}
 
 [flake8]
-ignore = None
+# H302 import only modules
+# H305 imports not grouped correctly
+# H307 like imports should be grouped together
+# H402 one line docstring needs punctuation
+# H405 multi line docstring summary not separated with an empty line
+# H904 Wrap long lines in parentheses instead of a backslash
+ignore = H302,H305,H307,H402,H405,H904
 show-source = True
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools