diff options
author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-05-09 01:06:59 +0000 |
---|---|---|
committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-05-09 01:06:59 +0000 |
commit | 01884b089d62bb10a9b3c124e99e819a63d51641 (patch) | |
tree | fe61e6820e05b7aaba145455eb7a3e2c1370b77e | |
parent | 3bdb1d8f7ae82572cf4750dc3249c88d4b619f82 (diff) | |
download | oslo-i18n-01884b089d62bb10a9b3c124e99e819a63d51641.tar.gz |
Updated from global requirements
Change-Id: Ie03659997dba4e415c2499f5e88ac95ad53f295c
-rw-r--r-- | requirements.txt | 2 | ||||
-rwxr-xr-x | setup.py | 8 | ||||
-rw-r--r-- | test-requirements.txt | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index dbb4dd1..61bfbbd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Babel>=0.9.6
\ No newline at end of file +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 34b5dc4..2fbb5fd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,6 @@ -hacking>=0.5.6,<0.8 +hacking>=0.8.0,<0.9 -sphinx>=1.1.2 +sphinx>=1.1.2,<1.2 oslosphinx oslotest |