From ed7d26d7b80c0399574a02accb789298613b643b Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Thu, 15 Jan 2015 14:36:31 +0300 Subject: [PATCH] Sync Neutron requirements with upstream Change-Id: Idf8d664f4503afc4193c8cdfde8f70a7b16b18b6 --- debian/control | 50 ++++++++++++++++---------------- rpm/SPECS/openstack-neutron.spec | 28 +++++++++--------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/debian/control b/debian/control index 8c2d734e8..c0f2f7d1b 100644 --- a/debian/control +++ b/debian/control @@ -5,46 +5,46 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Chuck Short Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6) Build-Depends-Indep: - alembic (>= 0.4.1), + alembic (>= 0.7.1), pep8, python-amqplib (>= 0.6.1), python-anyjson (>= 0.3.3), python-babel, - python-cliff (>= 1.4), + python-cliff (>= 1.7.0), python-configobj, python-coverage, python-hacking, - python-eventlet (>= 0.15.1), - python-fixtures (>= 0.3.12), + python-eventlet (>= 0.15.2), + python-fixtures (>= 0.3.14), python-greenlet (>= 0.3.2), python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), python-jinja2, python-jsonrpclib, python-keystonemiddleware (>= 1.0.0), - python-keystoneclient (>= 1:0.10.0), + python-keystoneclient (>= 1:0.11.1), python-kombu (>= 2.5.12), python-lxml (>= 2.3), - python-mock (>= 1.0b1), + python-mock (>= 1.0), python-mox, python-netaddr, python-neutronclient (>= 1:2.3.6), - python-novaclient (>= 2.17.0), - python-oslo.config (>= 1.4.0), + python-novaclient (>= 2.18.0), + python-oslo.config (>= 1.6.0), python-oslo.messaging (>= 1.4.0), python-oslo.db, python-paste, python-pastedeploy, python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), - python-psutil (>= 0.6.1), + python-psutil (>= 1.1.1), python-pyudev, - python-requests (>= 1.1), + python-requests (>= 2.2.0), python-routes, python-setuptools, python-simplejson, 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-stevedore (>= 0.14), + python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), + python-stevedore (>= 1.1.0), python-testtools (>= 0.9.32), python-webob, python-webtest, @@ -428,32 +428,32 @@ Package: python-neutron Architecture: all Section: python Depends: - alembic (>= 0.6.4), + alembic (>= 0.7.1), python-amqplib (>= 0.6.1), python-anyjson (>= 0.3.3), python-argparse, python-babel, - python-eventlet (>= 0.13.0), - python-greenlet (>= 0.3.12), + python-eventlet (>= 0.15.2), + python-greenlet (>= 0.3.2), python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), python-jinja2, python-keystonemiddleware (>= 1.0.0), - python-keystoneclient (>= 1:0.10.0), + python-keystoneclient (>= 1:0.11.1), python-kombu (>= 2.5.12), - python-netaddr (>= 0.7.6 ), + python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.3.6), - python-novaclient (>= 1:2.17.0), - python-oslo.config (>= 1:1.4.0), + python-novaclient (>= 1:2.18.0), + python-oslo.config (>= 1:1.6.0), python-paste, - python-pastedeploy(>= 1.5), - python-psutil (>= 0.6.1), - python-requests (>= 1.1), - python-oslo.rootwrap (>= 1.3.0a1), + python-pastedeploy(>= 1.5.0), + python-psutil (>= 1.1.1), + python-requests (>= 2.2.0), + python-oslo.rootwrap (>= 1.3.0), python-routes, 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-stevedore (>= 0.14), + python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), + python-stevedore (>= 1.1.0), python-webob, ${misc:Depends}, ${python:Depends} diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec index 9a8640649..f72c700e3 100644 --- a/rpm/SPECS/openstack-neutron.spec +++ b/rpm/SPECS/openstack-neutron.spec @@ -101,36 +101,36 @@ Provides: python-quantum = %{version}-%{release} Obsoletes: python-quantum < 2013.2-0.3.b3 Requires: MySQL-python -Requires: python-alembic >= 0.6.4 +Requires: python-alembic >= 0.7.1 Requires: python-amqplib Requires: python-anyjson >= 0.3.3 Requires: python-babel >= 1.3 -Requires: python-eventlet >= 0.15.1 +Requires: python-eventlet >= 0.15.2 Requires: python-greenlet >= 0.3.2 Requires: python-httplib2 >= 0.7.5 Requires: python-iso8601 >= 0.1.9 -Requires: python-jsonrpclib +Requires: python-jsonrpclib Requires: python-jinja2 -Requires: python-keystoneclient >= 1:0.10.0 -Requires: python-keystonemiddleware >= 1.0.0 -Requires: python-kombu >= 2.4.8 +Requires: python-keystoneclient >= 1:0.11.0 +Requires: python-keystonemiddleware >= 1.0.0 +Requires: python-kombu >= 2.5.0 Requires: python-lxml -Requires: python-oslo-messaging >= 1.4.0 +Requires: python-oslo-messaging >= 1.4.0 Requires: python-oslo-rootwrap >= 1.3.0 -Requires: python-requests >= 1.2.1 +Requires: python-requests >= 2.2.0 Requires: python-paste-deploy >= 1.5.0 Requires: python-routes >= 1.12.3 -Requires: python-sqlalchemy >= 0.8.4 +Requires: python-sqlalchemy >= 0.9.7 Requires: python-webob >= 1.2.3 -Requires: python-netaddr >= 0.7.6 -Requires: python-oslo-config >= 1.4.0 -Requires: python-oslo-db >= 0.4.0 +Requires: python-netaddr >= 0.7.12 +Requires: python-oslo-config >= 1.6.0 +Requires: python-oslo-db >= 1.3.0 Requires: python-qpid Requires: python-neutronclient >= 2.3.6 -Requires: python-stevedore >= 0.14 +Requires: python-stevedore >= 1.1.0 Requires: python-six >= 1.7.0 -Requires: python-novaclient >= 1:2.17.0 +Requires: python-novaclient >= 1:2.18.0 Requires: sudo -- 2.32.3