From ff64d008bfea70efb1c8663adeb29ab175229732 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 12 Jun 2017 08:30:23 +0200 Subject: Update (test-)requirements.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It updates requirements.txt and test-requirements.txt according to OpenStack stable/ocata. It removes useless copyrights. Change-Id: I603b3030df231f210af47232f20aef85a08e20ba Signed-off-by: Cédric Ollivier --- setup.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 460651cfd..a52d90555 100644 --- a/setup.py +++ b/setup.py @@ -9,9 +9,16 @@ # pylint: disable=missing-docstring -from setuptools import setup +import setuptools -setup( - setup_requires=['pbr>=1.9', 'setuptools>=17.1'], - pbr=True, -) +# 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>=1.8'], + pbr=True) -- cgit 1.2.3-korg