diff --git a/requirements-py3.txt b/requirements-py3.txt index 80a15f3488..1befb08bc9 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -8,19 +8,19 @@ netaddr>=0.7.6 PasteDeploy>=1.5.0 Paste Routes>=1.12.3 -six>=1.5.2 +six>=1.6.0 SQLAlchemy>=0.7.8,<=0.9.99 -sqlalchemy-migrate>=0.8.2,!=0.8.4 +sqlalchemy-migrate>=0.9.1 passlib lxml>=2.3 iso8601>=0.1.9 -python-keystoneclient>=0.7.0 +python-keystoneclient>=0.9.0 oslo.config>=1.2.0 # oslo.messaging tries to pull in eventlet # oslo.messaging>=1.3.0a4 Babel>=1.3 oauthlib>=0.6 -dogpile.cache>=0.5.0 +dogpile.cache>=0.5.3 jsonschema>=2.0.0,<3.0.0 # pycadf tries to pull in eventlet # pycadf>=0.4.1 diff --git a/requirements.txt b/requirements.txt index aa882d1651..31b98eabe0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,16 +9,16 @@ Paste Routes>=1.12.3 six>=1.6.0 SQLAlchemy>=0.7.8,<=0.9.99 -sqlalchemy-migrate>=0.8.2,!=0.8.4 +sqlalchemy-migrate>=0.9.1 passlib lxml>=2.3 iso8601>=0.1.9 -python-keystoneclient>=0.7.0 +python-keystoneclient>=0.9.0 oslo.config>=1.2.0 oslo.messaging>=1.3.0 Babel>=1.3 oauthlib>=0.6 dogpile.cache>=0.5.3 jsonschema>=2.0.0,<3.0.0 -pycadf>=0.4.1 +pycadf>=0.5.1 posix_ipc diff --git a/setup.py b/setup.py index 70c2b3f32b..736375744d 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-py3.txt b/test-requirements-py3.txt index 1195f46875..25a4215023 100644 --- a/test-requirements-py3.txt +++ b/test-requirements-py3.txt @@ -24,7 +24,7 @@ fixtures>=0.3.14 mock>=1.0 oslotest # required to build documentation -sphinx>=1.1.2,<1.2 +sphinx>=1.2.1,<1.3 # test wsgi apps without starting an http server WebTest>=2.0 diff --git a/test-requirements.txt b/test-requirements.txt index ca071b347a..f983eabde2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -22,7 +22,7 @@ fixtures>=0.3.14 mock>=1.0 oslotest # required to build documentation -sphinx>=1.1.2,<1.2 +sphinx>=1.2.1,<1.3 # test wsgi apps without starting an http server WebTest>=2.0