From 07e990d09f38fdf066dcb4c6faa79ce50eb33cdd Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 20 Jun 2014 06:50:11 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I4552b6e6a0c599df25cb26cef0cdb27af0f860ce --- requirements.txt | 6 +++--- setup.py | 8 ++++++++ test-requirements.txt | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 83acbe3..a91de88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -pbr>=0.6,<1.0 +pbr>=0.6,!=0.7,<1.0 argparse Babel>=1.3 python-ironicclient -python-keystoneclient>=0.6.0 +python-keystoneclient>=0.9.0 python-novaclient>=2.17.0 -oslo.config>=1.2.0 +oslo.config>=1.2.1 pyOpenSSL>=0.11 simplejson>=2.0.9 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 c69ee41..76cdf7c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ discover fixtures>=0.3.14 mock>=1.0 python-subunit>=0.0.18 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,<1.3 oslosphinx testrepository>=0.0.18 testscenarios>=0.4