From 6569c9cc127dd6358a86f25f266b7bac8ef6f41f Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 15 Nov 2017 18:28:39 +0100 Subject: Updated from global requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9fa229d0216b90f7619d1fe5e9f5c35be8899d19 Signed-off-by: Cédric Ollivier --- requirements.txt | 5 ++++- setup.py | 22 ++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7ab76f3..137159f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,13 @@ +# 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>=9.0.0 # Apache-2.0 python-neutronclient>=6.3.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0 python-heatclient>=1.6.1 # Apache-2.0 python-cinderclient>=3.1.0 # Apache-2.0 -python-magnumclient +python-magnumclient>=2.0.0 # Apache-2.0 ansible<2.4,>=2.1.0 wrapt>=1.7.0 # BSD License scp diff --git a/setup.py b/setup.py index a1bfd42..566d844 100644 --- a/setup.py +++ b/setup.py @@ -1,15 +1,21 @@ -#!/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. +# 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 -- cgit 1.2.3-korg