summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-06-14 14:14:25 -0400
committerMonty Taylor <mordred@inaugust.com>2012-06-14 14:36:27 -0400
commit5fb1e1f27f74a58318bf360d4535e4900ca2398f (patch)
treed89f40d509f2fbf2f1c0431f832060426f8c36db /setup.py
parent3ba77383238d463c903eb5c9ae0da9879fd700e0 (diff)
downloadpython-keystoneclient-5fb1e1f27f74a58318bf360d4535e4900ca2398f.tar.gz
Update to latest openstack.common setup code.
Change-Id: I044447b162e97d7464e49ba7fed0d41a757a3210
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/setup.py b/setup.py
index 634b3b4..1a7b634 100644
--- a/setup.py
+++ b/setup.py
@@ -1,20 +1,18 @@
import os
import sys
-from setuptools import setup, find_packages
-from keystoneclient.openstack.common.setup import generate_authors
+import setuptools
+
+from keystoneclient.openstack.common import setup
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
-requirements = ['httplib2', 'prettytable']
-if sys.version_info < (2, 6):
- requirements.append('simplejson')
-if sys.version_info < (2, 7):
- requirements.append('argparse')
+requires = setup.parse_requirements()
+depend_links = setup.parse_dependency_links()
+tests_require = setup.parse_requirements(['tools/test-requires'])
-generate_authors()
-setup(
+setuptools.setup(
name="python-keystoneclient",
version="2012.2",
description="Client library for OpenStack Keystone API",
@@ -23,7 +21,7 @@ setup(
license='Apache',
author='Nebula Inc, based on work by Rackspace and Jacob Kaplan-Moss',
author_email='gabriel.hurley@nebula.com',
- packages=find_packages(exclude=['tests', 'tests.*']),
+ packages=setuptools.find_packages(exclude=['tests', 'tests.*']),
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Console',
@@ -33,9 +31,11 @@ setup(
'Operating System :: OS Independent',
'Programming Language :: Python',
],
- install_requires=requirements,
+ install_requires=requires,
+ dependency_links=depend_links,
+ cmdclass=setup.get_cmdclass(),
- tests_require=["nose", "mock", "mox"],
+ tests_require=tests_require,
test_suite="nose.collector",
entry_points={