Merge "Fix dependency on anyjson"
This commit is contained in:
commit
150436ac21
@ -7,7 +7,7 @@ netaddr
|
|||||||
argparse
|
argparse
|
||||||
sqlalchemy
|
sqlalchemy
|
||||||
eventlet
|
eventlet
|
||||||
anyjson==0.3.1
|
anyjson>=0.3.1
|
||||||
Flask==0.9
|
Flask==0.9
|
||||||
sphinxcontrib-httpdomain
|
sphinxcontrib-httpdomain
|
||||||
pymongo==2.2.1
|
pymongo==2.2.1
|
||||||
|
2
setup.py
2
setup.py
@ -24,7 +24,7 @@ import setuptools
|
|||||||
from ceilometer.openstack.common import setup
|
from ceilometer.openstack.common import setup
|
||||||
|
|
||||||
requires = setup.parse_requirements()
|
requires = setup.parse_requirements()
|
||||||
depend_links = setup.parse_dependency_links()
|
depend_links = setup.parse_dependency_links(['tools/pip-requires.txt'])
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
name='ceilometer',
|
name='ceilometer',
|
||||||
|
Loading…
Reference in New Issue
Block a user