diff --git a/requirements.txt b/requirements.txt index 026c3dab..77cd7123 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -pbr>=0.6,<1.0 +pbr>=0.6,!=0.7,<1.0 Babel>=1.3 argparse PrettyTable>=0.7,<0.8 -python-keystoneclient>=0.6.0 +python-keystoneclient>=0.7.0 pyOpenSSL>=0.11 warlock>=1.0.1,<2 diff --git a/setup.py b/setup.py index 70c2b3f3..73637574 100644 --- 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)