From 20ddce276384d78bc6b9a0bf52394536392c3c9c Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Tue, 16 Dec 2014 17:18:32 +0200 Subject: [PATCH] Update rpm, deb specs according to "requirements.txt" Change-Id: I1f81cd99cfca1030bbf6cd605358f9e389868c93 --- debian/control | 33 +++++++++++------ rpm/SPECS/openstack-cinder.spec | 63 +++++++++++++++------------------ 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/debian/control b/debian/control index aa9a88725..1fa7f65ca 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends-Indep: python-anyjson (>= 0.3.3), python-babel (>= 1.3), python-coverage, - python-eventlet (>= 0.15.1), + python-eventlet (>= 0.15.2), python-fixtures (>= 0.3.14), python-glanceclient (>= 1:0.14.0 ), python-greenlet (>= 0.3.2), @@ -22,28 +22,36 @@ Build-Depends-Indep: python-mox, python-mysqldb, python-netaddr (>= 0.7.12), - python-novaclient (>= 2.18.0), + python-novaclient (>= 1:2.18.0), python-oslo.config (>= 1:1.4.0), + python-oslo.concurrency (>= 0.3.0), python-oslo.db (>= 1.0.0), python-oslo.rootwrap (>= 1.3.0), - python-oslo.messaging (>= 1.4.0), + python-oslo.serialization (>= 1.0.0), + python-oslo.utils (>= 1.0.0), + python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0) | python-oslo.messaging (>> 1.5.0), python-oslosphinx, + python-osprofiler (>= 0.3.0), python-paramiko (>= 1.13.0), python-paste, python-pastedeploy (>= 1.5.0), - python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), + python-crypto (>= 2.6), + python-barbicanclient (>= 2.1.0), python-barbicanclient (<< 3.0.0) | python-barbicanclient (>> 3.0.0), + python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0), python-setuptools, python-six (>= 1.7.0), python-sphinx, - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), + python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), python-stevedore (>= 1.0.0), python-suds (>= 0.4), python-swiftclient (>= 2.2.0), python-taskflow (>= 0.4), python-testtools (>= 0.9.32), python-webob (>= 1.2.3), + python-wsgiref (>= 0.1.2), + python-oslo.i18n (>= 1.0.0), python-subunit (>=0.0.18), testrepository (>= 0.0.18) Standards-Version: 3.9.4 @@ -56,13 +64,14 @@ Package: python-cinder Section: python Architecture: all Depends: + python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), python-amqplib (>= 0.6.1), python-anyjson (>= 0.3.3), python-argparse, python-babel (>= 1.3), - python-eventlet (>= 0.15.1), + python-eventlet (>= 0.15.2), python-glanceclient (>= 1:0.14.0 ), - python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), + python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), python-greenlet (>= 0.3.2), python-iso8601 (>= 0.1.9) , python-keystoneclient (>= 1:0.10.0), @@ -74,18 +83,21 @@ Depends: python-netaddr (>= 0.7.12), python-novaclient (>= 1:2.18.0), python-oslo.config (>= 1:1.4.0), + python-oslo.concurrency (>= 0.3.0), python-oslo.db (>= 1.0.0), - python-oslo.messaging (>= 1.4.0), + python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0) | python-oslo.messaging (>> 1.5.0), python-oslo.rootwrap (>= 1.3.0), + python-oslo.serialization (>= 1.0.0), + python-oslo.utils (>= 1.0.0), python-osprofiler (>= 0.3.0), python-paramiko (>= 1.13.0), python-paste, python-pastedeploy (>= 1.5.0), python-crypto (>= 2.6), - python-barbicanclient (>= 2.1.0), + python-barbicanclient (>= 2.1.0), python-barbicanclient (<< 3.0.0) | python-barbicanclient (>> 3.0.0), python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0), python-six (>= 1.7.0), - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), + python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), python-stevedore (>= 1.0.0), python-suds (>= 0.4), python-swiftclient (>= 2.2.0), @@ -93,6 +105,7 @@ Depends: python-rtslib-fb (>= 2.1.39), python-webob (>= 1.2.3), python-wsgiref (>= 0.1.2), + python-oslo.i18n (>= 1.0.0), qemu-utils, ${misc:Depends}, ${python:Depends} diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index 2b41a01a6..8c7968d26 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -66,56 +66,49 @@ Requires: MySQL-python Requires: qemu-img Requires: sysfsutils -Requires: python-paramiko >= 1.13.0 - -Requires: python-paste - -Requires: python-qpid -Requires: python-kombu >= 2.5.0 -Requires: python-amqplib - -Requires: python-eventlet >= 0.15.1 +Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 +Requires: python-anyjson >= 0.3.3 +Requires: python-argparse +Requires: python-babel >= 1.3 +Requires: python-eventlet >= 0.15.2 Requires: python-greenlet >= 0.3.2 Requires: python-iso8601 >= 0.1.9 +Requires: python-keystonemiddleware >= 1.0.0 +Requires: python-kombu >= 2.5.0 Requires: python-lxml >= 2.3 Requires: python-netaddr >= 0.7.12 Requires: python-oslo-config >= 1:1.4.0 -Requires: python-oslo-db >= 1.0.0 -Requires: python-oslo-messaging >= 1.4.0 -Requires: python-oslo-rootwrap >= 1.3.0 Requires: python-oslo.concurrency >= 0.3.0 +Requires: python-oslo-db >= 1.1.0 +Requires: python-oslo-messaging >= 1.4.0, python-oslo.messaging < 1.5.0, python-oslo.messaging > 1.5.0 +Requires: python-oslo-rootwrap >= 1.3.0 +Requires: python-oslo.serialization >= 1.0.0 +Requires: python-oslo.utils >= 1.0.0 Requires: python-osprofiler >= 0.3.0 -Requires: python-anyjson >= 0.3.3 -Requires: python-argparse -Requires: python-stevedore >= 1.0.0 -Requires: python-suds >= 0.4 - -Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 -Requires: python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2 - +Requires: python-paramiko >= 1.13.0 Requires: python-paste-deploy >= 1.5.0 Requires: python-crypto >= 2.6 -Requires: python-barbicanclient >= 2.1.0 +Requires: python-barbicanclient >= 2.1.0, python-barbicanclient < 3.0.0, python-barbicanclient > 3.0.0 Requires: python-glanceclient >= 1:0.14.0 +Requires: python-novaclient >= 1:2.18.0 +Requires: python-swiftclient >= 2.2.0 +Requires: python-requests >= 2.2.0, python-requests < 2.4.0, python-requests > 2.4.0 Requires: python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0 +Requires: python-taskflow >= 0.4 +Requires: python-rtslib-fb >= 2.1.fb39 +Requires: python-six >= 1.7.0 +Requires: python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 +Requires: python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2 +Requires: python-stevedore >= 1.1.0 +Requires: python-suds >= 0.4 Requires: python-webob >= 1.2.3 Requires: python-wsgiref >= 0.1.2 -Requires: python-oslo-i18n >= 1.0.0 +Requires: python-oslo.i18n >= 1.0.0 -Requires: python-swiftclient >= 2.2.0 -Requires: python-requests >= 1.2.1, python-requests < 2.4.0, python-requests > 2.4.0 +Requires: python-qpid +Requires: python-amqplib Requires: python-keystoneclient >= 1:0.10.0 -Requires: python-keystonemiddleware >= 1.0.0 -Requires: python-novaclient >= 1:2.18.0 - -Requires: python-six >= 1.7.0 - -Requires: python-babel >= 1.3 Requires: python-lockfile - -Requires: python-rtslib-fb >= 2.1.fb39 -Requires: python-taskflow >= 0.4 - Requires: python-ceph #Requires: iscsi-initiator-utils @@ -456,4 +449,4 @@ fi - Require python-cinderclient * Mon Sep 3 2012 Pádraig Brady - 2012.2-0.2.f3 -- Initial release \ No newline at end of file +- Initial release -- 2.45.2