summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-15 19:22:44 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-15 19:22:44 +0100
commit9427c62ea36102ac72052c3f2ff8cca0f1bdf2be (patch)
treeadb07ac971c877a536fd2b4afec1e66f90330efa
parent45a8a746baee0f8bd8413a15db8f77326160edf4 (diff)
Updated from global requirements
Change-Id: I892ae546490cac6e8a59c68bbf2dd214f8842597 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--requirements.txt15
-rw-r--r--setup.py23
2 files changed, 24 insertions, 14 deletions
diff --git a/requirements.txt b/requirements.txt
index 4623289..289aae2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,17 @@
+# 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
-requests!=2.12.2,>=2.10.0 # Apache-2.0
-oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
-python-openstackclient>=3.3.0 # Apache-2.0
+requests>=2.14.2 # Apache-2.0
+oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
+python-openstackclient>=3.11.0 # Apache-2.0
python-ceilometerclient>=2.5.0 # Apache-2.0
aodhclient>=0.7.0 # Apache-2.0
python-keystoneclient>=3.8.0 # Apache-2.0
-python-neutronclient>=5.1.0 # Apache-2.0
-python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0
+python-neutronclient>=6.3.0 # Apache-2.0
+python-novaclient>=9.0.0 # Apache-2.0
python-congressclient<2000,>=1.3.0 # Apache-2.0
-python-glanceclient>=2.5.0 # Apache-2.0
+python-glanceclient>=2.8.0 # Apache-2.0
virtualenv>=13.1.0 # MIT
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)