From 572689658566690e5861bea2cd45ed9c955e183e Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 1 Jul 2014 13:11:43 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ia126b95d6673ad73ad9f377c638a022e2b485799 --- requirements.txt | 8 ++++---- setup.py | 8 ++++++++ test-requirements.txt | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1e88678..c2601bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -cliff>=1.4.3 +cliff>=1.6.0 jsonschema>=2.0.0,<3.0.0 -pbr>=0.6,<1.0 -python-keystoneclient>=0.6.0 +pbr>=0.6,!=0.7,<1.0 +python-keystoneclient>=0.9.0 requests>=1.1 -six>=1.6.0 +six>=1.7.0 stevedore>=0.14 diff --git a/setup.py b/setup.py index 70c2b3f..7363757 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'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 820d6a6..bcd9d75 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,5 +3,5 @@ hacking>=0.8.0,<0.9 coverage>=3.6 discover python-subunit>=0.0.18 -sphinx>=1.1.2,<1.2 -testrepository>=0.0.17 +sphinx>=1.1.2,!=1.2.0,<1.3 +testrepository>=0.0.18