From 1711f1f9bb3cd514ded6839cff7e3d3aff1df547 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 21 May 2012 16:44:06 -0400 Subject: Align setup.py and tox with standards. Change-Id: Ic63c6fd4d770303ae5f295c58e43213e88e34b57 --- setup.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0c17013..d61a554 100644 --- a/setup.py +++ b/setup.py @@ -17,11 +17,10 @@ import setuptools import sys -requirements = ["httplib2", "prettytable"] -if sys.version_info < (2, 6): - requirements.append("simplejson") -if sys.version_info < (2, 7): - requirements.append("argparse") +from cinderclient.openstack.common import setup + +requires = setup.parse_requirements() +depend_links = setup.parse_dependency_links() def read_file(file_name): @@ -38,7 +37,9 @@ setuptools.setup( license="Apache License, Version 2.0", url="https://github.com/openstack/python-cinderclient", packages=setuptools.find_packages(exclude=['tests', 'tests.*']), - install_requires=requirements, + cmdclass=setup.get_cmdclass(), + install_requires=requires, + dependency_links=depend_links, tests_require=["nose", "mock"], test_suite="nose.collector", classifiers=[ -- cgit v1.2.1