From 2bf54c1459cc01181e04b0fe0ac01fa082569caa Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 1 Dec 2017 13:16:58 +0100 Subject: Updated from global requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ida6ba2c608237927af2f19dc65c1e1733221c1d1 Signed-off-by: Cédric Ollivier --- requirements.txt | 3 +++ setup.py | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1a0814bd..fbf387ba 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. pbr>=1.8 # Apache-2.0 paramiko>=2.0 # LGPLv2.1+ python-glanceclient>=2.5.0 # Apache-2.0 diff --git a/setup.py b/setup.py index a1e9b3bb..782bb21f 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,19 @@ -#!/usr/bin/env python - -# Copyright (c) 2017 Orange 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 # In python < 2.7.4, a lazy loading of package `pbr` will break -- cgit 1.2.3-korg