diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-15 18:51:05 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-15 18:51:05 +0100 |
| commit | 9a129c7eacdce8d7683d34bebbfd70b90a5effb1 (patch) | |
| tree | 7cf786db7bdfac77b2874b804db003a8f4d6c870 | |
| parent | e1372d3c4955a92f36bfb50ae5925dac2fc0b89c (diff) | |
Updated from global requirements
Change-Id: I7a975d6cdeae1f7dbf982eca8f8de16fa1bc3d95
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | requirements.txt | 7 | ||||
| -rw-r--r-- | setup.py | 23 |
2 files changed, 20 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt index d3dcf3c..63f4ae2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,8 @@ -pbr>=1.8 # Apache-2.0 -requests!=2.12.2,>=2.10.0 # 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 +requests>=2.14.2 # Apache-2.0 opnfv PyYAML>=3.10.0 # MIT networking-bgpvpn==6.0.0 # Apache-2.0 @@ -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) |