summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2017-12-05 01:00:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-05 01:00:48 +0000
commit06980156b3eed6a6e456d3105c70b68386c1dfb7 (patch)
treed55a61369c441de42fa6cf39e5299051703289a3
parent50e54357973864dcc516e693181f4a5a881cec17 (diff)
parentd0c30391de37d58b2aa781a416b84ca6347f0ede (diff)
Merge "Updated from global requirements" into stable/euphratesstable/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 4623289..3f3de53 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.
Flask!=0.11,<1.0,>=0.10 # BSD
paramiko>=2.0 # LGPLv2.1+
scp
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