From 216aa0d4dbe24e49414e1cff7d565963dfee73b3 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 10 Jan 2017 09:44:01 +0000 Subject: Updated from global requirements Change-Id: I9ae60dfb2ef5e8fb5aae482ddb08206fc1980ca5 --- requirements.txt | 5 ++++- setup.py | 11 +++++++++-- test-requirements.txt | 5 ++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9c4a708a..3f157628 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ -pbr>=0.5.21,<1.0 +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +pbr>=1.8 # Apache-2.0 Jinja2>=2.8 # BSD License (3 clause) diff --git a/setup.py b/setup.py index 70c2b3f3..782bb21f 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'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index c3726e8b..6489b16c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,4 @@ -pyyaml +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +PyYAML>=3.10.0 # MIT -- cgit 1.2.3-korg