diff --git a/requirements.txt b/requirements.txt index 93e29c68..cb74bf15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ argparse iso8601>=0.1.9 pbr>=0.6,!=0.7,<1.0 PrettyTable>=0.7,<0.8 -python-keystoneclient>=0.7.0 +python-keystoneclient>=0.9.0 PyYAML>=3.1.0 requests>=1.1 -six>=1.5.2 +six>=1.7.0 diff --git a/setup.py b/setup.py index 70c2b3f3..73637574 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 d85a7b9e..0fe69885 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ fixtures>=0.3.14 hacking>=0.8.0,<0.9 mock>=1.0 mox3>=0.7.0 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,<1.3 testrepository>=0.0.18 testscenarios>=0.4 testtools>=0.9.34