diff --git a/requirements.txt b/requirements.txt index 81003e0..b382b61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,10 +3,10 @@ pbr>=0.6,!=0.7,<1.0 anyjson>=0.3.3 argparse eventlet>=0.13.0 -python-keystoneclient>=0.7.0 +python-keystoneclient>=0.8.0 python-heatclient>=0.2.3 requests>=1.1 iso8601>=0.1.9 lxml>=2.3 oslo.config>=1.2.0 -six>=1.5.2 +six>=1.6.0 diff --git a/setup.py b/setup.py index 70c2b3f..7363757 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)