From 2925ca3ac3010b9a65276ad2cfc8118679827da3 Mon Sep 17 00:00:00 2001 From: masumotok Date: Tue, 7 Dec 2010 19:25:43 +0900 Subject: rev439ベースにライブマイグレーションの機能をマージ このバージョンはEBSなし、CPUフラグのチェックなし MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d88bc1e6f..938043d21 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,7 @@ from sphinx.setup_command import BuildDoc from nova.utils import parse_mailmap, str_dict_replace + class local_BuildDoc(BuildDoc): def run(self): for builder in ['html', 'man']: @@ -54,8 +55,8 @@ setup(name='nova', author='OpenStack', author_email='nova@lists.launchpad.net', url='http://www.openstack.org/', - cmdclass={ 'sdist': local_sdist, - 'build_sphinx' : local_BuildDoc }, + cmdclass={'sdist': local_sdist, + 'build_sphinx': local_BuildDoc}, packages=find_packages(exclude=['bin', 'smoketests']), include_package_data=True, scripts=['bin/nova-api', -- cgit From d91229f7a3b60095677e1bb76a548668c59ee9e2 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Tue, 18 Jan 2011 11:01:16 -0800 Subject: revert live_migration branch --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a20802e8b..3608ff805 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,6 @@ if os.path.isdir('.bzr'): version_file.write(vcsversion) - class local_BuildDoc(BuildDoc): def run(self): for builder in ['html', 'man']: -- cgit From 50ec058cc70044a4cfbad97147940a6124aa10a8 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Wed, 19 Jan 2011 10:50:54 +0100 Subject: Refactor run_tests.sh to allow us to run an extra command after the tests. Run pep8 after unit tests in run_tests.sh. Fix setup.py to be PEP-8 compliant. --- setup.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3608ff805..65adbe992 100644 --- a/setup.py +++ b/setup.py @@ -41,6 +41,7 @@ class local_BuildDoc(BuildDoc): self.finalize_options() BuildDoc.run(self) + class local_sdist(sdist): """Customized sdist hook - builds the ChangeLog file from VC first""" @@ -57,17 +58,17 @@ class local_sdist(sdist): changelog_file.write(str_dict_replace(changelog, mailmap)) sdist.run(self) -nova_cmdclass= { 'sdist': local_sdist, - 'build_sphinx' : local_BuildDoc } +nova_cmdclass = {'sdist': local_sdist, + 'build_sphinx': local_BuildDoc} try: - from babel.messages import frontend as babel - nova_cmdclass['compile_catalog'] = babel.compile_catalog - nova_cmdclass['extract_messages'] = babel.extract_messages - nova_cmdclass['init_catalog'] = babel.init_catalog - nova_cmdclass['update_catalog'] = babel.update_catalog + from babel.messages import frontend as babel + nova_cmdclass['compile_catalog'] = babel.compile_catalog + nova_cmdclass['extract_messages'] = babel.extract_messages + nova_cmdclass['init_catalog'] = babel.init_catalog + nova_cmdclass['update_catalog'] = babel.update_catalog except: - pass + pass setup(name='nova', version=version.canonical_version_string(), -- cgit