From e58a4a95997bf83d0d806c850369633a63927eb4 Mon Sep 17 00:00:00 2001 From: Timur Sufiev Date: Tue, 29 Oct 2013 14:50:18 +0400 Subject: [PATCH] Update requirements to match havana's ones. Update repo with openstack/requirements/update.py. Change-Id: Ia62764c4e5960f206c79f7f6b678a7b2c49ebcb8 --- requirements.txt | 6 +++--- setup.py | 25 +++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8eb452c..6d57961 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ pbr>=0.5.21,<1.0 eventlet>=0.13.0 Flask>=0.10,<1.0 oslo.config>=1.2.0 -PyYAML +PyYAML>=3.1.0 #openstack-common requires -iso8601>=0.1.4 +iso8601>=0.1.8 kombu>=2.4.8 Babel>=1.3 -python-keystoneclient>=0.2.0 +python-keystoneclient>=0.4.1 diff --git a/setup.py b/setup.py index 31eba50..70c2b3f 100644 --- a/setup.py +++ b/setup.py @@ -1,19 +1,20 @@ -#!/usr/bin/python +#!/usr/bin/env python +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # -# Copyright (c) 2013 Mirantis, Inc. +# 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 # -# 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 # -# 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. +# 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 setuptools.setup(