From 1ec1bec0a6ff82149c030b1df68fb7cf2f09630c Mon Sep 17 00:00:00 2001
From: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date: Mon, 22 Feb 2016 12:10:17 -0800
Subject: [PATCH] Syncing with mitaka dependencies

Change-Id: I99448977f2078437c083e684769c50ce432a8f68
---
 requirements.txt      |  1 +
 setup.py              | 11 +++++++++--
 test-requirements.txt | 31 ++++++++++++++++---------------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c299e3b..2594ccb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,5 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+pbr>=1.6 # Apache-2.0
 Babel>=1.3
diff --git a/setup.py b/setup.py
index 70c2b3f..782bb21 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,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'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 6061981..9b001d1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,23 +2,24 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
--e git://github.com/openstack/heat.git@stable/liberty#egg=heat
+-e git://github.com/openstack/heat.git@master#egg=heat
 -e git://git.openstack.org/openstack/python-group-based-policy-client.git@master#egg=gbpclient
 # Hacking already pins down pep8, pyflakes and flake8
 hacking<0.11,>=0.10.0
-coverage>=3.6
-mock>=1.2
-mox>=0.5.3
-mox3>=0.7.0
+bandit>=0.17.3 # Apache-2.0
+coverage>=3.6 # Apache-2.0
+kombu>=3.0.25 # BSD
+mock>=1.2 # BSD
+mox3>=0.7.0 # Apache-2.0
 PyMySQL>=0.6.2 # MIT License
-oslosphinx>=2.5.0 # Apache-2.0
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-paramiko>=1.13.0
-qpid-python;python_version=='2.7'
-psycopg2>=2.5
-reno[sphinx]>=0.1.1  # Apache2
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
-testresources>=0.2.4
+paramiko>=1.16.0 # LGPL
+qpid-python;python_version=='2.7' # Apache-2.0
+psycopg2>=2.5 # LGPL/ZPL
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+testresources>=0.2.4 # Apache-2.0/BSD
+reno>=0.1.1 # Apache2