From c213ffda17d09a68fdbb619ba6db4b8a101e85a9 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Fri, 21 Aug 2015 18:09:21 -0700 Subject: Update from global requirements This syncs up the requirements with global-requirements on stable/juno. We need this to cap the dependency on futures to avoid a conflict with capped futures in the version of taskflow in stable/juno, otherwise setting up devstack with cinder enabled fails. Also update .gitreview for stable/juno since this is the first patch on the new branch. Also sets up the tox func target, which is basically a cherry pick of commit 8aff0bda9c35ab96146f4f419803e62710ab5618. Note that while we make it possible to run the functional tests, we exclude them in Jenkins runs since they are also excluded from stable/kilo due to instability in the gate. Depends-On: I5a2d3f7860aeae6bf442e9372286eedbc290d6a8 Change-Id: I507aade31da19be71900b81880cd5568b351663e Partial-Bug: #1486576 --- setup.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 70c2b3f..056c16c 100644 --- 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'], pbr=True) -- cgit v1.2.1