diff options
author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-04-30 02:46:06 +0000 |
---|---|---|
committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2014-04-30 02:46:06 +0000 |
commit | 2f6fd834b3339096dc2f54b34f2c6667e5d71182 (patch) | |
tree | 33b1354622051c358962238829e6f28978702888 | |
parent | 3e4f5939848e1da99c0291abfb1d83b45abc9aab (diff) | |
download | pycadf-2f6fd834b3339096dc2f54b34f2c6667e5d71182.tar.gz |
Updated from global requirements
Change-Id: Ib667b02069ba68b4e33eae844caae6d33ba368c3
-rw-r--r-- | requirements.txt | 4 | ||||
-rw-r--r-- | setup.py | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index f0d4737..7afb091 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Babel>=1.3 iso8601>=0.1.9 netaddr>=0.7.6 oslo.config>=1.2.0 -oslo.messaging>=1.3.0a9 +oslo.messaging>=1.3.0 pytz>=2010h -six>=1.5.2 +six>=1.6.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) |