diff options
author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2015-02-20 13:50:00 +0000 |
---|---|---|
committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2015-02-20 13:50:00 +0000 |
commit | a0997c70e8f988eca678b9da7d0365046a296223 (patch) | |
tree | 76478b54527991e4d6e84d72142cfeb8c4ac5da2 | |
parent | 55a829c1cda58a4ea280a0d88cfaa7ff207c0eab (diff) | |
download | ceilometermiddleware-a0997c70e8f988eca678b9da7d0365046a296223.tar.gz |
Updated from global requirements
Change-Id: Ibc6c73369fa7ba9b9f0219544866b92b51458d97
-rw-r--r-- | requirements.txt | 6 | ||||
-rwxr-xr-x | setup.py | 8 | ||||
-rw-r--r-- | test-requirements.txt | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index bfdc603..24ef967 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,9 +4,9 @@ oslo.config>=1.6.0 oslo.context>=0.1.0 -oslo.messaging>=1.4.0,!=1.5.0 +oslo.messaging>=1.6.0 # Apache-2.0 oslo.utils>=1.2.0 pbr>=0.6,!=0.7,<1.0 -pycadf>=0.6.0 -six>=1.7.0 +pycadf>=0.8.0 +six>=1.9.0 Babel>=1.3 @@ -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 1803eb5..6f3e778 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,7 @@ hacking>=0.10.0,<0.11 coverage>=3.6 discover -python-subunit +python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 oslosphinx>=2.2.0 oslotest>=1.2.0 |