diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-12-01 13:15:46 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-12-01 13:15:46 +0100 |
| commit | 305babe027f847085baf509d889ec408aa13a168 (patch) | |
| tree | 6cb220cf050d1a97eadd72d432a993f63b7b1972 | |
| parent | 29d58a38f38284cb9a2fa9b9da87682e9256dc5c (diff) | |
Updated from global requirements
Change-Id: I3f4ed1c6bb82e2797841e129f035ba27a5471eba
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -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 d4a0377dd..5b7cd63a3 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>=1.8 # 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 f22863c7d..a0659101c 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.0 # Apache-2.0 mock>=2.0 # BSD nose # LGPL |