diff --git a/requirements.txt b/requirements.txt index 96bb4c317..c04b005b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ pecan>=0.4.5 python-glanceclient>=0.9.0 python-heatclient>=0.2.3 python-neutronclient>=2.3.4,<3 -python-keystoneclient>=0.7.0 +python-keystoneclient>=0.8.0 python-swiftclient>=1.6 six>=1.6.0 SQLAlchemy>=0.7.8,<=0.9.99 diff --git a/setup.py b/setup.py index 70c2b3f32..736375744 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)