diff options
author | Monty Taylor <mordred@inaugust.com> | 2012-05-21 16:44:06 -0400 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2012-05-21 16:44:06 -0400 |
commit | 1711f1f9bb3cd514ded6839cff7e3d3aff1df547 (patch) | |
tree | 33454a3f10d9231ec5644901fbf8493d4cad5a3e /setup.py | |
parent | 471704df644eced17026c280b0aab9e549718e14 (diff) | |
download | python-cinderclient-1711f1f9bb3cd514ded6839cff7e3d3aff1df547.tar.gz |
Align setup.py and tox with standards.
Change-Id: Ic63c6fd4d770303ae5f295c58e43213e88e34b57
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -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=[ |