aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hague <shague@redhat.com>2017-12-01 14:44:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-01 14:44:52 +0000
commitafaf05163634168b9d60a1ae74a3eadb86239036 (patch)
tree3bf86f5637a118b30dd9dc337db56d0a03d3e632
parent7f9b0c2a4a85479d1458e9fb07a4c5961307b9c2 (diff)
parent2bf54c1459cc01181e04b0fe0ac01fa082569caa (diff)
Merge "Updated from global requirements" into stable/euphrates
-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 1a0814b..fbf387b 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 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