aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-12-01 13:17:21 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-12-01 13:17:21 +0100
commit65389c1cc8d113e8a21938118561c413d940d6e9 (patch)
tree1a54ae0648a1ef2d401786261b20ea44f016fb54
parentf029879bc7dfaebc5f74c29f54100c03049a56d3 (diff)
Updated from global requirements
Change-Id: I95c1e9155d3759f115850aa951a63bc974157ce6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--requirements.txt3
-rw-r--r--setup.py21
2 files changed, 17 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt
index a5af657..8ee198f 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.
paramiko>=2.0 # LGPLv2.1+
requests!=2.12.2,>=2.10.0 # Apache-2.0
python-keystoneclient>=3.8.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index a1e9b3b..782bb21 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