diff options
author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-08-24 17:14:30 +0000 |
---|---|---|
committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-08-24 17:14:30 +0000 |
commit | 025c004c26cd9bf29a867de30b1591abceb85b90 (patch) | |
tree | a4025b372537efc2aa0d6e49ab21ace9f5641e60 | |
parent | f6dca124c1089521a89af68ed9b9ac98a2033001 (diff) | |
download | oslo-serialization-025c004c26cd9bf29a867de30b1591abceb85b90.tar.gz |
Updated from global requirements
Change-Id: Ief3ff160a479dfb1d0602038ba7c14580ec08d21
-rw-r--r-- | requirements.txt | 4 | ||||
-rwxr-xr-x | setup.py | 8 | ||||
-rw-r--r-- | test-requirements.txt | 10 |
3 files changed, 15 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt index a486611..d5a86a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Babel>=0.9.6 +Babel>=1.3 six>=1.7.0 # Only for timeutils in openstack.common - once we're using the # library version this can be removed. iso8601>=0.1.9 -oslo.utils>=0.2.0 +oslo.utils>=0.2.0 # Apache-2.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 a3504ed..916ebf7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,11 +1,11 @@ hacking>=0.5.6,<0.8 mock>=1.0 -netaddr +netaddr>=0.7.6 # this is required for the docs build jobs sphinx>=1.1.2,!=1.2.0,<1.3 -oslosphinx +oslosphinx>=2.2.0.0a2 -oslotest -simplejson -oslo.i18n>=0.2.0 +oslotest>=1.1.0.0a1 +simplejson>=2.0.9 +oslo.i18n>=0.2.0 # Apache-2.0 |