diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-15 19:22:15 +0100 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2017-11-23 16:55:18 +0000 |
| commit | 02670759cfd8b94aa7545849d458f281e7c01d57 (patch) | |
| tree | 2293dc4e7d03f13344587bb28d8a2a059366b8cf | |
| parent | 909b7fd20787b3f56ed83a9a5070499883eb697a (diff) | |
Updated from global requirements
Change-Id: I948ca4fdd98755630de06ea0b32a759a79c1795c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | requirements.txt | 5 | ||||
| -rw-r--r-- | setup.py | 23 |
2 files changed, 19 insertions, 9 deletions
diff --git a/requirements.txt b/requirements.txt index a5af6579..237beaf5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,8 @@ +# 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 +requests>=2.14.2 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 opnfv functest @@ -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) |