aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-15 18:51:26 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-15 18:51:26 +0100
commitb8e171c36bdc86c6a45978285ef67cb6f3075b87 (patch)
tree93907cc9daa941216a92f612047778dfa8e09059
parent760c222ea904b1407c693a7637c94f17f50fda25 (diff)
Updated from global requirements
Change-Id: I873c244e9a0cd92f627641981b388e8250f50935 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--requirements.txt11
-rw-r--r--setup.py23
2 files changed, 22 insertions, 12 deletions
diff --git a/requirements.txt b/requirements.txt
index 1a0814b..239c0b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,13 @@
-pbr>=1.8 # Apache-2.0
+# 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!=2.1.0,>=2.0.0 # Apache-2.0
paramiko>=2.0 # LGPLv2.1+
-python-glanceclient>=2.5.0 # Apache-2.0
-requests!=2.12.2,>=2.10.0 # Apache-2.0
+python-glanceclient>=2.8.0 # Apache-2.0
+requests>=2.14.2 # Apache-2.0
xmltodict>=0.10.1 # MIT
python-keystoneclient>=3.8.0 # Apache-2.0
-python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0
+python-novaclient>=9.0.0 # Apache-2.0
python-tackerclient>=0.8.0 # Apache-2.0
PyYAML>=3.10.0 # MIT
opnfv
diff --git a/setup.py b/setup.py
index a1e9b3b..566d844 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
@@ -18,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr>=1.8'],
+ setup_requires=['pbr>=2.0.0'],
pbr=True)