From d2e29db5d94e0a41e118d4d9567a6027976feb6b Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 27 Sep 2012 13:26:01 -0400 Subject: [PATCH] Fix dependency on anyjson The main requirements.txt and the one for documentation had different specification for anyjson. This change also makes explicit the fact that we do not require anything other than what is listed in pip-requires to install. The library function looks at requirements.txt, too, which we don't have and should not use. Change-Id: I8e79ad0803e3a9ebeb2a1dae30b2e5abdbbe8276 Signed-off-by: Doug Hellmann --- doc/requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index b583248e..9c3cd414 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -7,7 +7,7 @@ netaddr argparse sqlalchemy eventlet -anyjson==0.3.1 +anyjson>=0.3.1 Flask==0.9 sphinxcontrib-httpdomain pymongo==2.2.1 diff --git a/setup.py b/setup.py index 816d03d0..8f0f9d25 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ import setuptools from ceilometer.openstack.common import setup requires = setup.parse_requirements() -depend_links = setup.parse_dependency_links() +depend_links = setup.parse_dependency_links(['tools/pip-requires.txt']) setuptools.setup( name='ceilometer',