From 24ad114d3b29b46328b2544453606b6d69d1e045 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 26 Jun 2012 11:04:48 -0500 Subject: Cleanup of setup.py usage of openstack-common. Change-Id: Id74cd3aec982b84851ce84bbb5207d86da04bc63 --- setup.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ce554e82..e7590ef5 100644 --- a/setup.py +++ b/setup.py @@ -19,19 +19,10 @@ import sys from novaclient.openstack.common import setup -requirements = ["httplib2", "prettytable"] -if sys.version_info < (2, 6): - requirements.append("simplejson") -if sys.version_info < (2, 7): - requirements.append("argparse") - - def read_file(file_name): return open(os.path.join(os.path.dirname(__file__), file_name)).read() -setup.generate_authors() - setuptools.setup( name="python-novaclient", version=setup.get_post_version('novaclient'), @@ -42,9 +33,9 @@ setuptools.setup( license="Apache License, Version 2.0", url="https://github.com/openstack/python-novaclient", packages=setuptools.find_packages(exclude=['tests', 'tests.*']), - install_requires=requirements, - tests_require=["nose", "mock"], + install_requires=setup.parse_requirements(), test_suite="nose.collector", + cmdclass=setup.get_cmdclass(), classifiers=[ "Development Status :: 5 - Production/Stable", "Environment :: Console", -- cgit v1.2.1