From: Eoghan Glynn <eglynn@redhat.com>
Date: Thu, 27 Sep 2012 21:03:16 +0000 (+0100)
Subject: Loosen anyjson dependency to avoid clash with ceilometer
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=69121952feba0d0046ba6df24258f6011b0325ce;p=openstack-build%2Fcinder-build.git

Loosen anyjson dependency to avoid clash with ceilometer

Ceilometer depends on anyjson 0.3.1, whereas cinder requires
exacly 0.2.4.

The net effect is a devstack with ceilometer installed will
appear to work initially, as ceilometer is sparked up after
cinder. However, if any of the cinder services are subsequently
restarted, they fail with:

  pkg_resources.DistributionNotFound: anyjson==0.2.4

By simply allowing the cinder anyjson dependency version to
be greater than as opposed to an exact match, we can avoid
the clash.

Change-Id: I21737a2504705f15dd16e6762b44624678177442
---

diff --git a/tools/pip-requires b/tools/pip-requires
index d45a24386..22e0ee88a 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,6 +1,6 @@
 SQLAlchemy>=0.7.3
 amqplib==0.6.1
-anyjson==0.2.4
+anyjson>=0.2.4
 eventlet>=0.9.17
 kombu==1.0.4
 lockfile==0.8