From 85c03d8b1d44829f26965208ef02b6f8aa02d143 Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Wed, 21 May 2014 09:37:22 -0700 Subject: [PATCH] taking the global reqs that we can Change-Id: Icfdeeab14e90728aa8167ad6587d51e9b10cb846 --- requirements.txt | 2 +- setup.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bbac51a612..1e3b339884 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ dnspython>=1.9.4 eventlet>=0.9.15 greenlet>=0.3.1 -netifaces>=0.5 +netifaces>=0.5,!=0.10.0,!=0.10.1 pastedeploy>=1.3.3 simplejson>=2.0.9 xattr>=0.4 diff --git a/setup.py b/setup.py index 70c2b3f32b..736375744d 100644 --- a/setup.py +++ b/setup.py @@ -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)