From c22d95ba24265f7be1e2b62f9f0528e2b2bae7b4 Mon Sep 17 00:00:00 2001 From: jfwood Date: Mon, 11 Nov 2013 22:13:35 -0600 Subject: [PATCH] Remove Celery and Kombu version pinning The pinned version of Kombu was incompatible with the latest un-pinned version of Celery. Removing this pinning fixed the issue. Change-Id: I868c86ac67350e6429ce806af3385623c8931548 --- rpmbuild/package_dependencies.sh | 3 +-- tools/pip-requires | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rpmbuild/package_dependencies.sh b/rpmbuild/package_dependencies.sh index bfb4459dd..aca46454e 100755 --- a/rpmbuild/package_dependencies.sh +++ b/rpmbuild/package_dependencies.sh @@ -13,8 +13,7 @@ fpm -s python -t rpm pysqlite fpm -s python -t rpm eventlet fpm -s python -t rpm oslo.config fpm -s python -t rpm iso8601 -# pin kombu because v3.0 breaks celery -fpm -s python -t rpm -v 2.5.15 kombu +fpm -s python -t rpm kombu fpm -s python -t rpm webob # --> # python-webob.noarch 0.9.6.1-3.el6 exists, but is incompatible # fpm -s python -t rpm PasteDeploy diff --git a/tools/pip-requires b/tools/pip-requires index 8a1243040..2918c6b8a 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -4,10 +4,10 @@ pysqlite>=2.6.0 eventlet>=0.12.1 oslo.config>=1.1.0 iso8601>=0.1.4 -kombu<3.0.0 +kombu webob>=1.2.3 PasteDeploy>=1.5.0 -Celery>=3.0.19 +Celery python-keystoneclient>=0.3.1 stevedore>=0.8 pycrypto>=2.6