From 1f7a95fc1586b8e6849caa989084e94d0244ac05 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Fri, 30 May 2014 16:32:34 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I65149149fd5b80e93961206f1c9e2037db764b84
---
 requirements.txt      | 6 +++---
 setup.py              | 8 ++++++++
 test-requirements.txt | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 18bc988..66563e5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
-pbr>=0.6,<1.0
+pbr>=0.6,!=0.7,<1.0
 argparse
 PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.7.0
+python-keystoneclient>=0.9.0
 requests>=1.1
 simplejson>=2.0.9
 Babel>=1.3
-six>=1.5.2
+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 e17d892..a936aa8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,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
 testtools>=0.9.34
 testrepository>=0.0.18