diff --git a/requirements.txt b/requirements.txt index 8646341..645c922 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -pbr>=0.5.21,<1.0 -Babel>=0.9.6 \ No newline at end of file +pbr>=0.6,!=0.7,<1.0 +Babel>=1.3 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) diff --git a/test-requirements.txt b/test-requirements.txt index 2a46bd8..d43524b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,9 +3,9 @@ hacking>=0.5.6,<0.8 coverage>=3.6 discover fixtures>=0.3.14 -python-subunit -sphinx>=1.1.2 -oslosphinx -testrepository>=0.0.17 -testscenarios>=0.4,<0.5 -testtools>=0.9.32 \ No newline at end of file +python-subunit>=0.0.18 +sphinx>=1.1.2,!=1.2.0,<1.3 +oslosphinx>=2.2.0.0a2 +testrepository>=0.0.18 +testscenarios>=0.4 +testtools>=0.9.34