openstack
/
ec2-api
Code Issues Proposed changes

update from global requirements and up version for master 

Change-Id: Ie426484642bfe9b878f7257d9b9c3986e680b804
This commit is contained in:
Andrey Pavlov 2016-04-21 13:32:56 +03:00
parent b33815fb6e
commit 604fd639af
4 changed files with 75 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
requirements.txt
View File

@ -1,31 +1,31 @@
Babel>=1.3 Babel>=1.3,!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3 # BSD
boto>=2.32.1 boto>=2.32.1 # MIT
botocore>=1.0.0 # Apache-2.0 botocore>=1.0.0 # Apache-2.0
eventlet>=0.17.4 eventlet!=0.18.3,>=0.18.2 # MIT
greenlet>=0.3.2 greenlet>=0.3.2 # MIT
httplib2>=0.7.5 httplib2>=0.7.5 # MIT
lxml>=2.3 lxml>=2.3 # BSD
oslo.config>=2.6.0 # Apache-2.0 oslo.config>=3.9.0 # Apache-2.0
oslo.concurrency>=2.3.0 # Apache-2.0 oslo.concurrency>=3.5.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0 oslo.context>=2.2.0 # Apache-2.0
oslo.db>=3.2.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0
oslo.log>=1.12.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0
oslo.messaging>2.6.1,!=2.8.0 # Apache-2.0 oslo.messaging>=4.5.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0
oslo.service>=1.0.0 # Apache-2.0 oslo.service>=1.0.0 # Apache-2.0
oslo.utils>=2.8.0 # Apache-2.0 oslo.utils>=3.5.0 # Apache-2.0
Paste Paste # MIT
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0 # MIT
pbr>=1.6 pbr>=1.6 # Apache-2.0
python-cinderclient>=1.3.1 python-cinderclient>=1.6.0 # Apache-2.0
python-glanceclient>=0.18.0 python-glanceclient>=2.0.0 # Apache-2.0
python-keystoneclient>=1.6.0,!=1.8.0 python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0 # Apache-2.0
python-neutronclient>=2.6.0 python-neutronclient>=4.2.0 # Apache-2.0
python-novaclient>=2.29.0,!=2.33.0 python-novaclient>=2.29.0,!=2.33.0 # Apache-2.0
python-openstackclient>=1.5.0 python-openstackclient>=2.1.0 # Apache-2.0
Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7' Routes>=1.12.3,!=2.0,!=2.1,!=2.3.0;python_version=='2.7' # MIT
Routes>=1.12.3,!=2.0;python_version!='2.7' Routes>=1.12.3,!=2.0,!=2.3.0;python_version!='2.7' # MIT
six>=1.9.0 six>=1.9.0 # MIT
SQLAlchemy>=0.9.9,<1.1.0 SQLAlchemy>=1.0.10,<1.1.0 # MIT
sqlalchemy-migrate>=0.9.6 sqlalchemy-migrate>=0.9.6 # Apache-2.0
WebOb>=1.2.3 WebOb>=1.2.3 # MIT

2
setup.cfg
View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = ec2-api name = ec2-api
version = 2.0.0 version = 3.0.0
summary = OpenStack Ec2api Service summary = OpenStack Ec2api Service
description-file = description-file =
README.rst README.rst

20
test-requirements.txt
View File

@ -1,11 +1,11 @@
coverage>=3.6 coverage>=3.6 # Apache-2.0
fixtures>=1.3.1 fixtures>=1.3.1,<2.0 # Apache-2.0/BSD
hacking>=0.10.2,<0.11 hacking>=0.10.2,<0.11 # Apache-2.0
mock>=1.2 mock>=1.2 # BSD
nose nose # LGPL
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
pylint==1.4.4 # GNU GPL v2 pylint==1.4.5 # GNU GPL v2
python-subunit>=0.0.18 python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD
testrepository>=0.0.18 testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 testtools>=1.4.0 # MIT

35
tools/update-from-global-requirements.sh Executable file
View File

@ -0,0 +1,35 @@
#!/bin/bash
# Copyright (c) 2016 OpenStack Foundation
# All Rights Reserved.
#
# 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.
GLOBAL_REQS_PATH=${1:-$HOME/openstack/requirements/global-requirements.txt}
function update() {
rm -f temp-requirements.txt
touch temp-requirements.txt
while read line ; do
local module=`echo $line | sed 's/\([.A-Za-z0-9\-]*\)[ ><!=\t]*.*/\1/'`
local newm=`grep -e "^$module[ ><!=\t]" $GLOBAL_REQS_PATH`
if ! grep "$newm" temp-requirements.txt >/dev/null ; then
echo "$newm" >> temp-requirements.txt
fi
done < $1
mv temp-requirements.txt $1
}
echo "Update requirements"
update requirements.txt
echo "Update test-requirements"
update test-requirements.txt