diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-11-16 07:12:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-16 07:12:13 +0000 |
| commit | 27cd13769905ba0a5545c33ac15f7c523015bb86 (patch) | |
| tree | 829565a6b839b684497c0632947e06d35a8acbaa | |
| parent | f617cbf76e7fe53f8ee7841a3c75f2fa2e8aa5ce (diff) | |
| parent | f8e15124e147d6e5ac7848fcf08f0f5ce5f48b7d (diff) | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 3 | ||||
| -rw-r--r-- | setup.py | 23 | ||||
| -rw-r--r-- | test-requirements.txt | 3 |
3 files changed, 20 insertions, 9 deletions
diff --git a/requirements.txt b/requirements.txt index 49d244ec2..a5d0e5aba 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. pbr!=2.1.0,>=2.0.0 # Apache-2.0 PyYAML>=3.10.0 # MIT GitPython>=1.0.1 # BSD License (3 clause) @@ -1,14 +1,19 @@ -#!/usr/bin/env python - -# Copyright (c) 2017 Orange and others. +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # -# 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 - -# pylint: disable=missing-docstring +# 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 +# +# 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 diff --git a/test-requirements.txt b/test-requirements.txt index aeb0ecb3b..372e9ce46 100644 --- a/test-requirements.txt +++ b/test-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. coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0 # BSD nose # LGPL |