From c530de638916d29c609f66194569f57234a68289 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Mon, 26 Mar 2012 22:48:48 -0700 Subject: Basic get/list operations work * 'glance image-list' and 'glance image-show' work * Set up tests, pep8, venv --- setup.py | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f989680..98f0444 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,15 @@ import os -import sys -from setuptools import setup, find_packages + +import setuptools from glanceclient.openstack.common.setup import parse_requirements from glanceclient.openstack.common.setup import parse_dependency_links from glanceclient.openstack.common.setup import write_requirements from glanceclient.openstack.common.setup import write_git_changelog + requires = parse_requirements() -depend_links = parse_dependency_links() +dependency_links = parse_dependency_links() write_requirements() write_git_changelog() @@ -16,17 +17,17 @@ write_git_changelog() def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -setup( - name = "python-glanceclient", - version = "2012.1", - description = "Client library for OpenStack Glance API", - long_description = read('README.rst'), - url = 'https://github.com/openstack/python-glanceclient', - license = 'Apache', - author = 'Jay Pipes, based on work by Rackspace and Jacob Kaplan-Moss', - author_email = 'jay.pipes@gmail.com', - packages = find_packages(exclude=['tests', 'tests.*']), - classifiers = [ +setuptools.setup( + name="python-glanceclient", + version="2012.1", + description="Client library for OpenStack Glance API", + long_description=read('README.rst'), + url='https://github.com/openstack/python-glanceclient', + license='Apache', + author='OpenStack Glance Contributors', + author_email='glance@example.com', + packages=setuptools.find_packages(exclude=['tests', 'tests.*']), + classifiers=[ 'Development Status :: 4 - Beta', 'Environment :: Console', 'Intended Audience :: Developers', @@ -35,12 +36,9 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', ], - install_requires=requires, - dependency_links=depend_links, - - test_suite = "nose.collector", - - entry_points = { - 'console_scripts': ['glance = glanceclient.shell:main'] - } + #install_requires=requires, + install_requires=[], + dependency_links=dependency_links, + test_suite="nose.collector", + entry_points={'console_scripts': ['glance = glanceclient.shell:main']}, ) -- cgit v1.2.1