diff options
author | Yuriy Taraday <yorik.sar@gmail.com> | 2012-03-06 12:53:07 +0400 |
---|---|---|
committer | Yuriy Taraday <yorik.sar@gmail.com> | 2012-03-07 12:51:39 +0400 |
commit | 01a938f7fe4dea274713e49f124fcc45702f80a0 (patch) | |
tree | c761687b21ab3b10b29f2aa175480d1dba3a7682 /setup.py | |
parent | d8324bb3d089acd444bd1639a3efc07e89556f69 (diff) | |
download | nova-01a938f7fe4dea274713e49f124fcc45702f80a0.tar.gz |
HACKING fixes, all but sqlalchemy.
Looks like this fixes all HACKING problems that were around.
Thanks to Dina Belova and Alexander Kovalev for this work.
Change-Id: I8157f0d4890184c1216aab63ef7180ee8b7a184d
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -19,18 +19,16 @@ import glob import os -from setuptools import find_packages - -from setuptools import setup +import setuptools from nova import version nova_cmdclass = {} try: - from sphinx.setup_command import BuildDoc + from sphinx import setup_command - class local_BuildDoc(BuildDoc): + class local_BuildDoc(setup_command.BuildDoc): def run(self): for builder in ['html', 'man']: self.builder = builder @@ -55,14 +53,14 @@ def find_data_files(destdir, srcdir): return package_data -setup(name='nova', +setuptools.setup(name='nova', version=version.canonical_version_string(), description='cloud computing fabric controller', author='OpenStack', author_email='nova@lists.launchpad.net', url='http://www.openstack.org/', cmdclass=nova_cmdclass, - packages=find_packages(exclude=['bin', 'smoketests']), + packages=setuptools.find_packages(exclude=['bin', 'smoketests']), include_package_data=True, test_suite='nose.collector', scripts=['bin/clear_rabbit_queues', |