summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Pavlov <andrey-mp@yandex.ru>2016-04-21 13:32:56 +0300
committerAndrey Pavlov <andrey-mp@yandex.ru>2016-04-21 14:51:09 +0300
commit604fd639af8badd997b1e60f1e0d756a8c654d86 (patch)
treed50fa0bc0b31e3cdef2a126c17e98018eab4a535
parentb33815fb6eed72aac19d0fa49beaf73defe4c507 (diff)
update from global requirements and up version for master
Notes
Notes (review): Code-Review+2: Feodor Tersin <ftersin@hotmail.com> Workflow+1: Feodor Tersin <ftersin@hotmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 21 Apr 2016 17:21:05 +0000 Reviewed-on: https://review.openstack.org/308889 Project: openstack/ec2-api Branch: refs/heads/master
-rw-r--r--requirements.txt58
-rw-r--r--setup.cfg2
-rw-r--r--test-requirements.txt20
-rwxr-xr-xtools/update-from-global-requirements.sh35
4 files changed, 75 insertions, 40 deletions
diff --git a/requirements.txt b/requirements.txt
index bf9bb67..db798e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,31 +1,31 @@
1Babel>=1.3 1Babel>=1.3,!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3 # BSD
2boto>=2.32.1 2boto>=2.32.1 # MIT
3botocore>=1.0.0 # Apache-2.0 3botocore>=1.0.0 # Apache-2.0
4eventlet>=0.17.4 4eventlet!=0.18.3,>=0.18.2 # MIT
5greenlet>=0.3.2 5greenlet>=0.3.2 # MIT
6httplib2>=0.7.5 6httplib2>=0.7.5 # MIT
7lxml>=2.3 7lxml>=2.3 # BSD
8oslo.config>=2.6.0 # Apache-2.0 8oslo.config>=3.9.0 # Apache-2.0
9oslo.concurrency>=2.3.0 # Apache-2.0 9oslo.concurrency>=3.5.0 # Apache-2.0
10oslo.context>=0.2.0 # Apache-2.0 10oslo.context>=2.2.0 # Apache-2.0
11oslo.db>=3.2.0 # Apache-2.0 11oslo.db>=4.1.0 # Apache-2.0
12oslo.log>=1.12.0 # Apache-2.0 12oslo.log>=1.14.0 # Apache-2.0
13oslo.messaging>2.6.1,!=2.8.0 # Apache-2.0 13oslo.messaging>=4.5.0 # Apache-2.0
14oslo.serialization>=1.10.0 # Apache-2.0 14oslo.serialization>=1.10.0 # Apache-2.0
15oslo.service>=1.0.0 # Apache-2.0 15oslo.service>=1.0.0 # Apache-2.0
16oslo.utils>=2.8.0 # Apache-2.0 16oslo.utils>=3.5.0 # Apache-2.0
17Paste 17Paste # MIT
18PasteDeploy>=1.5.0 18PasteDeploy>=1.5.0 # MIT
19pbr>=1.6 19pbr>=1.6 # Apache-2.0
20python-cinderclient>=1.3.1 20python-cinderclient>=1.6.0 # Apache-2.0
21python-glanceclient>=0.18.0 21python-glanceclient>=2.0.0 # Apache-2.0
22python-keystoneclient>=1.6.0,!=1.8.0 22python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0 # Apache-2.0
23python-neutronclient>=2.6.0 23python-neutronclient>=4.2.0 # Apache-2.0
24python-novaclient>=2.29.0,!=2.33.0 24python-novaclient>=2.29.0,!=2.33.0 # Apache-2.0
25python-openstackclient>=1.5.0 25python-openstackclient>=2.1.0 # Apache-2.0
26Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7' 26Routes>=1.12.3,!=2.0,!=2.1,!=2.3.0;python_version=='2.7' # MIT
27Routes>=1.12.3,!=2.0;python_version!='2.7' 27Routes>=1.12.3,!=2.0,!=2.3.0;python_version!='2.7' # MIT
28six>=1.9.0 28six>=1.9.0 # MIT
29SQLAlchemy>=0.9.9,<1.1.0 29SQLAlchemy>=1.0.10,<1.1.0 # MIT
30sqlalchemy-migrate>=0.9.6 30sqlalchemy-migrate>=0.9.6 # Apache-2.0
31WebOb>=1.2.3 31WebOb>=1.2.3 # MIT
diff --git a/setup.cfg b/setup.cfg
index 4266aef..e9d3122 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
1[metadata] 1[metadata]
2name = ec2-api 2name = ec2-api
3version = 2.0.0 3version = 3.0.0
4summary = OpenStack Ec2api Service 4summary = OpenStack Ec2api Service
5description-file = 5description-file =
6 README.rst 6 README.rst
diff --git a/test-requirements.txt b/test-requirements.txt
index 0b86d6e..9de7e62 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,11 @@
1coverage>=3.6 1coverage>=3.6 # Apache-2.0
2fixtures>=1.3.1 2fixtures>=1.3.1,<2.0 # Apache-2.0/BSD
3hacking>=0.10.2,<0.11 3hacking>=0.10.2,<0.11 # Apache-2.0
4mock>=1.2 4mock>=1.2 # BSD
5nose 5nose # LGPL
6oslotest>=1.10.0 # Apache-2.0 6oslotest>=1.10.0 # Apache-2.0
7pylint==1.4.4 # GNU GPL v2 7pylint==1.4.5 # GNU GPL v2
8python-subunit>=0.0.18 8python-subunit>=0.0.18 # Apache-2.0/BSD
9sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 9sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD
10testrepository>=0.0.18 10testrepository>=0.0.18 # Apache-2.0/BSD
11testtools>=1.4.0 11testtools>=1.4.0 # MIT
diff --git a/tools/update-from-global-requirements.sh b/tools/update-from-global-requirements.sh
new file mode 100755
index 0000000..ff9ab1a
--- /dev/null
+++ b/tools/update-from-global-requirements.sh
@@ -0,0 +1,35 @@
1#!/bin/bash
2# Copyright (c) 2016 OpenStack Foundation
3# All Rights Reserved.
4#
5# Licensed under the Apache License, Version 2.0 (the "License"); you may
6# not use this file except in compliance with the License. You may obtain
7# a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14# License for the specific language governing permissions and limitations
15# under the License.
16
17GLOBAL_REQS_PATH=${1:-$HOME/openstack/requirements/global-requirements.txt}
18
19function update() {
20 rm -f temp-requirements.txt
21 touch temp-requirements.txt
22 while read line ; do
23 local module=`echo $line | sed 's/\([.A-Za-z0-9\-]*\)[ ><!=\t]*.*/\1/'`
24 local newm=`grep -e "^$module[ ><!=\t]" $GLOBAL_REQS_PATH`
25 if ! grep "$newm" temp-requirements.txt >/dev/null ; then
26 echo "$newm" >> temp-requirements.txt
27 fi
28 done < $1
29 mv temp-requirements.txt $1
30}
31
32echo "Update requirements"
33update requirements.txt
34echo "Update test-requirements"
35update test-requirements.txt