From 2a09f4166562c1a91410a246d4ab08f0d5d71039 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 1 Dec 2017 13:16:10 +0100 Subject: Updated from global requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib52ff2a6cdbd1563dae26c7f8d74da825e499d68 Signed-off-by: Cédric Ollivier --- requirements.txt | 3 +++ setup.py | 33 +++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index fa58983..e172c32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,6 @@ +# 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. python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0 python-neutronclient>=5.1.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 diff --git a/setup.py b/setup.py index a5f79ec..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -1,16 +1,29 @@ -#!/usr/bin/env python - -# Copyright (c) 2016 Cable Television Laboratories and others. +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. -from setuptools import setup +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT +import setuptools -__author__ = 'spisarski' +# 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 -setup( +setuptools.setup( setup_requires=['pbr>=1.8'], pbr=True) -- cgit 1.2.3-korg