From eefd65fd299c19b5b6b8ab80930081f433b4a75a Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 5 Jan 2016 08:38:31 +0100
Subject: [PATCH] Update requirements

Update requirements with global requirements so that this is compatible
with other development tools. Right now the requirement on pbr forces
a downgrade of pbr - see
http://lists.openstack.org/pipermail/openstack-dev/2016-January/083297.html

Change-Id: Ica86a4fd23e47b901537af02807bbb104c4ed578
---
 requirements.txt      |  4 ++--
 setup.py              | 11 +++++++++--
 test-requirements.txt | 18 +++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 setup.py

diff --git a/requirements.txt b/requirements.txt
index 6ac9f9d..5b68e5c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=0.6,!=0.7,<1.0
+pbr>=1.6
 argparse
-Babel>=0.9.6
+Babel>=1.3
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 70c2b3f..782bb21
--- 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 b50d8b5..0a641a0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,15 +2,15 @@
 # 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
-mock>=1.0
+hacking<0.11,>=0.10.0
+mock>=1.2
 
 coverage>=3.6
 discover
-fixtures>=0.3.14
-python-subunit
-sphinx>=1.1.2
-oslosphinx
-testrepository>=0.0.17
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
+fixtures>=1.3.1
+python-subunit>=0.0.18
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+testrepository>=0.0.18
+testscenarios>=0.4
+testtools>=1.4.0