diff options
| author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-09-09 04:32:55 +0000 |
|---|---|---|
| committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-09-09 04:32:55 +0000 |
| commit | 6d7fc83dbc9de7035b02deac914648030f04030b (patch) | |
| tree | aa1728f1b9f58f733fa6a7d3e3b87ea32bf1f014 | |
| parent | 4e7a576227be408548307b1fc8675e1cc193ca0a (diff) | |
| download | oslo-concurrency-6d7fc83dbc9de7035b02deac914648030f04030b.tar.gz | |
Updated from global requirements
Change-Id: Idea153aebacb98b0ebaf416ab3ceb8ae0991b699
| -rw-r--r-- | requirements-py3.txt | 6 | ||||
| -rw-r--r-- | requirements.txt | 8 | ||||
| -rwxr-xr-x | setup.py | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
4 files changed, 17 insertions, 9 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt index 426cb94..57a150f 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -3,11 +3,11 @@ # process, which may cause wedges in the gate later. pbr>=0.6,!=0.7,<1.0 -Babel>=0.9.6 +Babel>=1.3 iso8601>=0.1.9 fixtures>=0.3.14 oslo.config>=1.4.0.0a3 -oslo.i18n>=0.1.0 -oslo.utils>=0.2.0 +oslo.i18n>=0.2.0 # Apache-2.0 +oslo.utils>=0.2.0 # Apache-2.0 posix_ipc six>=1.7.0 diff --git a/requirements.txt b/requirements.txt index e5a8987..07df270 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,13 +2,13 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -Babel>=0.9.6 +Babel>=1.3 iso8601>=0.1.9 -eventlet>=0.13.0 +eventlet>=0.15.1 greenlet>=0.3.2 fixtures>=0.3.14 oslo.config>=1.4.0.0a3 -oslo.i18n>=0.2.0 -oslo.utils>=0.2.0 +oslo.i18n>=0.2.0 # Apache-2.0 +oslo.utils>=0.2.0 # Apache-2.0 posix_ipc six>=1.7.0 @@ -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 ef8f44c..5837b24 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,8 +3,8 @@ # process, which may cause wedges in the gate later. hacking>=0.9.1,<0.10 -oslotest +oslotest>=1.1.0.0a2 # These are needed for docs generation -oslosphinx +oslosphinx>=2.2.0.0a2 sphinx>=1.1.2,!=1.2.0,<1.3 |