From 78fa0fc19d2bbefa1d63fa5296b04efb4f221afa Mon Sep 17 00:00:00 2001
From: Aaron Rosen <aaronorosen@gmail.com>
Date: Tue, 29 Jul 2014 10:24:39 -0700
Subject: [PATCH] Sync requirements with upstream

$ cd /opt/stack/requirements
$ python update.py /opt/stack/congress

This is also required for devstack integration as devstack runs these
commands on stack.sh and stops if a project is out of sync.

Change-Id: I9057fbefb18fc09ff70278f9db152327f94b37a0
---
 requirements.txt      |  6 +++---
 setup.py              | 10 +++++++++-
 test-requirements.txt | 12 +++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ca58a80cb..2030ae1bc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 argparse
 Babel>=1.3
 eventlet>=0.13.0
-keystonemiddleware
-mox<1.0
+keystonemiddleware>=1.0.0
+mox>=0.5.3
 Paste
 PasteDeploy>=1.5.0
 pbr>=0.6,!=0.7,<1.0
@@ -11,5 +11,5 @@ python-novaclient>=2.17.0
 python-neutronclient>=2.3.5,<3
 Routes>=1.12.3,!=2.0
 six>=1.7.0
-oslo.config>=1.2.1
+oslo.config>=1.4.0.0a3
 WebOb>=1.2.3
diff --git a/setup.py b/setup.py
index 2a0786a8b..736375744 100755
--- 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>=0.5.21,<1.0'],
+    setup_requires=['pbr'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 98d968867..2991b4f23 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,12 +5,6 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-python-subunit
-sphinx>=1.1.2
-oslo.sphinx
-testrepository>=0.0.17
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
-tox<1.7
-virtualenv>=1.9.1
-
+python-subunit>=0.0.18
+sphinx>=1.1.2,!=1.2.0,<1.3
+testrepository>=0.0.18