From 05f76d6f194bb726f11ffd7623369da3a710ea84 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Fri, 11 Jul 2014 15:12:10 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I8743a917f06f41c6ffaba09daac0d3ee9221247b
---
 requirements.txt      | 22 +++++++++++-----------
 setup.py              |  9 +++++++++
 test-requirements.txt |  6 +++---
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f69d9de85..a5d325f64 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
 pbr>=0.6,!=0.7,<1.0
 # Horizon Core Requirements
-django>=1.4,<1.6
-django_compressor>=1.3
-django_openstack_auth>=1.1.3
+Django>=1.4,<1.7
+django_compressor>=1.4
+django_openstack_auth>=1.1.4
 eventlet>=0.13.0
 kombu>=2.4.8
-iso8601>=0.1.8
+iso8601>=0.1.9
 netaddr>=0.7.6
-python-cinderclient>=1.0.6
-python-glanceclient>=0.9.0
-python-heatclient>=0.2.3
-python-keystoneclient>=0.4.1
-python-novaclient>=2.15.0
-python-neutronclient>=2.3.0,<3
-python-swiftclient>=1.5
+python-cinderclient>=1.0.7
+python-glanceclient>=0.13.1
+python-heatclient>=0.2.9
+python-keystoneclient>=0.9.0
+python-novaclient>=2.17.0
+python-neutronclient>=2.3.5,<3
+python-swiftclient>=2.0.2
 python-ceilometerclient>=1.0.6
 pytz>=2010h
 # Horizon Utility Requirements
diff --git a/setup.py b/setup.py
index c0a24eab2..736375744 100755
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# 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 c497df263..7ea7269d1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,16 +5,16 @@ coverage>=3.6
 django-nose
 mock>=1.0
 mox>=0.5.3
-nodeenv
+nodeenv>=0.9.4 # BSD License
 nose
 nose-exclude
 nosexcover
 openstack.nose_plugin>=0.7
 nosehtmloutput>=0.0.3
 selenium
-xvfbwrapper
+xvfbwrapper>=0.1.3 #license: MIT
 # Docs Requirements
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,!=1.2.0,<1.3
 # for bug 1091333, remove after sphinx >1.1.3 is released.
 docutils==0.9.1
 oslosphinx