From 8d8f96ac1a3d380adb943893eed22b1f9ae254d7 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Fri, 31 Mar 2017 17:44:38 +0000 Subject: Updated from global requirements It appears os-net-config is not in the sync list for g-r. We should add it, but in the meantime this will get us up to date. Change-Id: I828a394ce72824eaabe904b563f73734a88c21f8 --- setup.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) mode change 100755 => 100644 setup.py (limited to 'setup.py') diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 70c2b3f..566d844 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,6 +16,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'], + setup_requires=['pbr>=2.0.0'], pbr=True) -- cgit 1.2.3-korg