diff --git a/requirements.txt b/requirements.txt index 0a752ee774..8f0ead5e39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pbr>=0.6,<1.0 +pbr>=0.6,!=0.7,<1.0 # # The greenlet package must be compiled with gcc and needs # the Python.h headers. Make sure you install the python-dev @@ -14,13 +14,13 @@ Routes>=1.12.3 WebOb>=1.2.3 argparse boto>=2.12.0,!=2.13.0 -sqlalchemy-migrate>=0.8.2,!=0.8.4 +sqlalchemy-migrate>=0.9.1 httplib2>=0.7.5 kombu>=2.4.8 pycrypto>=2.6 iso8601>=0.1.9 ordereddict -oslo.config>=1.2.0 +oslo.config>=1.2.1 stevedore>=0.14 netaddr>=0.7.6 @@ -28,17 +28,17 @@ netaddr>=0.7.6 python-swiftclient>=2.0.2 # For VMware storage backed. -oslo.vmware>=0.2 # Apache-2.0 +oslo.vmware>=0.3 # Apache-2.0 # For paste.util.template used in keystone.common.template Paste jsonschema>=2.0.0,<3.0.0 python-cinderclient>=1.0.6 -python-keystoneclient>=0.7.0 +python-keystoneclient>=0.9.0 pyOpenSSL>=0.11 # Required by openstack.common libraries -six>=1.5.2 +six>=1.7.0 oslo.messaging>=1.3.0 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.txt b/test-requirements.txt index 9fa52e7f6f..037560342c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ discover fixtures>=0.3.14 mox>=0.5.3 mock>=1.0 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,<1.3 requests>=1.1 testrepository>=0.0.18 testtools>=0.9.34