From 34019d2bf57fd519adce11d763e4f4c3033311ae Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@macinnes.ie>
Date: Fri, 15 May 2015 16:04:02 +0100
Subject: [PATCH] Update Dashboard requirements

Change-Id: Ib4c65743f59295cc94926c54d294c945e06872bf
---
 contrib/designate-dashboard/requirements.txt      | 15 +++++++++------
 contrib/designate-dashboard/setup.py              |  8 ++++++++
 contrib/designate-dashboard/test-requirements.txt | 15 +++++++++------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/contrib/designate-dashboard/requirements.txt b/contrib/designate-dashboard/requirements.txt
index 072719fe..11a5e1e0 100644
--- a/contrib/designate-dashboard/requirements.txt
+++ b/contrib/designate-dashboard/requirements.txt
@@ -1,7 +1,10 @@
-pbr>=0.6,!=0.7,<1.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pbr>=0.11,<2.0
 # Horizon Core Requirements
-Django>=1.4,<1.7
-django_compressor>=1.3
-django_openstack_auth>=1.1.4
-Babel>=0.9.6
-python-designateclient>=1.1.1
+Django>=1.4.2,<1.8
+django_compressor>=1.4
+django_openstack_auth>=1.1.7,!=1.1.8
+Babel>=1.3
+python-designateclient>=1.0.0
diff --git a/contrib/designate-dashboard/setup.py b/contrib/designate-dashboard/setup.py
index 70c2b3f3..73637574 100755
--- a/contrib/designate-dashboard/setup.py
+++ b/contrib/designate-dashboard/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/contrib/designate-dashboard/test-requirements.txt b/contrib/designate-dashboard/test-requirements.txt
index 393983c8..5b037dd9 100644
--- a/contrib/designate-dashboard/test-requirements.txt
+++ b/contrib/designate-dashboard/test-requirements.txt
@@ -1,14 +1,17 @@
-hacking>=0.9.2,<0.10
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+hacking>=0.10.0,<0.11
 
 coverage>=3.6
 discover
 mock>=1.0
-mox
-oslo.config>=1.2.1
-pylint==0.25.2
+mox>=0.5.3
+oslo.config>=1.11.0  # Apache-2.0
+pylint==1.4.1  # GNU GPL v2
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=0.9.36,!=1.2.0
 unittest2
-django_nose
+django-nose>=1.2
 
 -e git+https://github.com/openstack/horizon.git#egg=horizon