diff options
author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-09-10 07:39:01 +0000 |
---|---|---|
committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-09-10 07:39:01 +0000 |
commit | a2cdee68fd748cb09b1224243db77e1f7d2f2ac9 (patch) | |
tree | 3bbe17764a766073906c04203d80faa531160fdf | |
parent | 47aa3e2d11e00bcc9f0f1012c4b317dc5073c68d (diff) | |
download | oslo-middleware-a2cdee68fd748cb09b1224243db77e1f7d2f2ac9.tar.gz |
Updated from global requirements0.1.0
Change-Id: I6ba0a580547d52534517c50a2367ee111d0f0aef
-rw-r--r-- | requirements.txt | 6 | ||||
-rwxr-xr-x | setup.py | 8 | ||||
-rw-r--r-- | test-requirements.txt | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index 6138d3d..414bdf6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ # 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 -oslo.config>=1.2.1 -oslo.i18n>=0.1.0 +Babel>=1.3 +oslo.config>=1.4.0.0a3 +oslo.i18n>=0.3.0 # Apache-2.0 six>=1.7.0 WebOb>=1.2.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 b321d7d..506a33d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ fixtures>=0.3.14 hacking>=0.9.2,<0.10 mock>=1.0 -oslosphinx -oslotest +oslosphinx>=2.2.0.0a2 +oslotest>=1.1.0.0a2 sphinx>=1.1.2,!=1.2.0,<1.3 testtools>=0.9.34 |