From e6cda7c3b6fa099ed77c653c323346f67111feed Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 16 Jul 2014 00:07:13 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I03c975e6ec0b0e169f039fb71686a4fcc9d81c48 --- requirements.txt | 2 +- setup.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 073369e9..416c9974 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ docutils==0.9.1 oslosphinx pbr>=0.6,!=0.7,<1.0 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,<1.3 testrepository>=0.0.18 testtools>=0.9.34 diff --git a/setup.py b/setup.py index 70c2b3f3..73637574 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)