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 c273c2b93471ad0d3ab4990458147c253d22bdc5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 23 Dec 2010 08:57:04 -0800 Subject: Added reference in setup.py so that python setup.py test works now. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d88bc1e6f..1abf4d9fe 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,7 @@ setup(name='nova', 'build_sphinx' : local_BuildDoc }, packages=find_packages(exclude=['bin', 'smoketests']), include_package_data=True, + test_suite='nose.collector', scripts=['bin/nova-api', 'bin/nova-compute', 'bin/nova-dhcpbridge', -- cgit From c7305af78049f94dedcbb55480b91a3c6d843b9f Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Tue, 4 Jan 2011 00:23:35 -0500 Subject: Apply logging changes as a giant patch to work around the cloudpipe delete + add issue in the original patch. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1abf4d9fe..e00911099 100644 --- a/setup.py +++ b/setup.py @@ -64,9 +64,11 @@ setup(name='nova', 'bin/nova-dhcpbridge', 'bin/nova-import-canonical-imagestore', 'bin/nova-instancemonitor', + 'bin/nova-logspool', 'bin/nova-manage', 'bin/nova-network', 'bin/nova-objectstore', 'bin/nova-scheduler', + 'bin/nova-spoolsentry', 'bin/nova-volume', 'tools/nova-debug']) -- cgit From 13b1374897c59c6e59fe5542ab71b0180aa6fc00 Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Thu, 6 Jan 2011 15:08:26 -0500 Subject: Track version info, and make available for logging. --- setup.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e00911099..6d7cecb70 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,45 @@ from sphinx.setup_command import BuildDoc from nova.utils import parse_mailmap, str_dict_replace +NOVA_VERSION = ['2011', '1'] + +VERSIONFILE_DEFAULT_VCS_VERSION = """ +version_info = {"branch_nick": "LOCALBRANCH", "revision_id": "LOCALREVISION"} +""" + +VERSIONFILE_DATA = """ +# below this line automatically generated by setup.py + +YEAR = %r +COUNT = %r +""" % (NOVA_VERSION[0], NOVA_VERSION[1]) + + +VERSIONFILE_DATA += """ + +def string(): + return '.'.join([YEAR, COUNT]) + + +def vcs_version_string(): + return "%s:%s" % (version_info['branch_nick'], version_info['revision_id']) + + +def string_with_vcs(): + return "%s-%s" % (string(), vcs_version_string()) +""" + +with open("nova/version.py", 'w') as version_file: + if os.path.isdir('.bzr'): + vcs_cmd = subprocess.Popen(["bzr", "version-info", "--python"], + stdout=subprocess.PIPE) + vcsversion = vcs_cmd.communicate()[0] + version_file.write(vcsversion) + else: + version_file.write(VERSIONFILE_DEFAULT_VCS_VERSION) + version_file.write(VERSIONFILE_DATA) + + class local_BuildDoc(BuildDoc): def run(self): for builder in ['html', 'man']: -- cgit From 8b3925e4d4b97dc28bfc903483ec4793fb38fed5 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Fri, 7 Jan 2011 15:17:03 +0100 Subject: Less code generation. --- setup.py | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6d7cecb70..2ccece789 100644 --- a/setup.py +++ b/setup.py @@ -24,44 +24,14 @@ from setuptools.command.sdist import sdist from sphinx.setup_command import BuildDoc from nova.utils import parse_mailmap, str_dict_replace +from nova import version -NOVA_VERSION = ['2011', '1'] - -VERSIONFILE_DEFAULT_VCS_VERSION = """ -version_info = {"branch_nick": "LOCALBRANCH", "revision_id": "LOCALREVISION"} -""" - -VERSIONFILE_DATA = """ -# below this line automatically generated by setup.py - -YEAR = %r -COUNT = %r -""" % (NOVA_VERSION[0], NOVA_VERSION[1]) - - -VERSIONFILE_DATA += """ - -def string(): - return '.'.join([YEAR, COUNT]) - - -def vcs_version_string(): - return "%s:%s" % (version_info['branch_nick'], version_info['revision_id']) - - -def string_with_vcs(): - return "%s-%s" % (string(), vcs_version_string()) -""" - -with open("nova/version.py", 'w') as version_file: - if os.path.isdir('.bzr'): +if os.path.isdir('.bzr'): + with open("nova/vcsversion.py", 'w') as version_file: vcs_cmd = subprocess.Popen(["bzr", "version-info", "--python"], stdout=subprocess.PIPE) vcsversion = vcs_cmd.communicate()[0] version_file.write(vcsversion) - else: - version_file.write(VERSIONFILE_DEFAULT_VCS_VERSION) - version_file.write(VERSIONFILE_DATA) class local_BuildDoc(BuildDoc): @@ -88,7 +58,7 @@ class local_sdist(sdist): sdist.run(self) setup(name='nova', - version='2011.1', + version=version.canonical_version(), description='cloud computing fabric controller', author='OpenStack', author_email='nova@lists.launchpad.net', -- cgit From a29bba7e9f57b97085902fa97d17de32da8044cb Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Sat, 8 Jan 2011 00:02:24 +0100 Subject: s/canonical_version/canonical_version_string/g --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2ccece789..5b58274c6 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ class local_sdist(sdist): sdist.run(self) setup(name='nova', - version=version.canonical_version(), + version=version.canonical_version_string(), description='cloud computing fabric controller', author='OpenStack', author_email='nova@lists.launchpad.net', -- cgit From 00808c08c6935872ad8842ce093b515b68bdf3de Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 10 Jan 2011 11:26:38 -0800 Subject: Added babel/gettext build support. --- setup.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5b58274c6..3608ff805 100644 --- a/setup.py +++ b/setup.py @@ -57,14 +57,25 @@ class local_sdist(sdist): changelog_file.write(str_dict_replace(changelog, mailmap)) sdist.run(self) +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 +except: + pass + 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={ 'sdist': local_sdist, - 'build_sphinx' : local_BuildDoc }, + cmdclass=nova_cmdclass, packages=find_packages(exclude=['bin', 'smoketests']), include_package_data=True, test_suite='nose.collector', -- 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 From 9a3d84b29e33eb5249cc1c04f61bb47f8d1fc1f6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 25 Jan 2011 11:41:49 -0800 Subject: Adds conditional around sphinx inclusion. --- setup.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 65adbe992..484e50e6c 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ import subprocess from setuptools import setup, find_packages from setuptools.command.sdist import sdist -from sphinx.setup_command import BuildDoc from nova.utils import parse_mailmap, str_dict_replace from nova import version @@ -34,14 +33,6 @@ if os.path.isdir('.bzr'): version_file.write(vcsversion) -class local_BuildDoc(BuildDoc): - def run(self): - for builder in ['html', 'man']: - self.builder = builder - self.finalize_options() - BuildDoc.run(self) - - class local_sdist(sdist): """Customized sdist hook - builds the ChangeLog file from VC first""" @@ -57,9 +48,22 @@ class local_sdist(sdist): with open("ChangeLog", "w") as changelog_file: changelog_file.write(str_dict_replace(changelog, mailmap)) sdist.run(self) +nova_cmdclass = {'sdist': local_sdist} + + +try: + from sphinx.setup_command import BuildDoc + class local_BuildDoc(BuildDoc): + def run(self): + for builder in ['html', 'man']: + self.builder = builder + self.finalize_options() + BuildDoc.run(self) + nova_cmdclass['build_sphinx'] = local_BuildDoc + +except: + pass -nova_cmdclass = {'sdist': local_sdist, - 'build_sphinx': local_BuildDoc} try: from babel.messages import frontend as babel -- cgit From dd7008e4edc6e9be2248ff663664adb2a662e745 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 27 Jan 2011 23:53:46 -0800 Subject: Fixed a pep8 spacing issue. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 484e50e6c..e3c45ce3e 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ nova_cmdclass = {'sdist': local_sdist} try: from sphinx.setup_command import BuildDoc + class local_BuildDoc(BuildDoc): def run(self): for builder in ['html', 'man']: -- cgit