From a5b116b6fb5702bd140b89ec2f714a392e7f564f Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 7 Feb 2012 10:06:49 -0800 Subject: [PATCH] Move changelog writing to openstack.common. Change-Id: I8627efcc1ee74fa62d1dd1b5dc419c3c031d0175 --- melange/openstack/common/setup.py | 9 +++++++++ setup.py | 12 ++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/melange/openstack/common/setup.py b/melange/openstack/common/setup.py index ff716b40..4f822814 100644 --- a/melange/openstack/common/setup.py +++ b/melange/openstack/common/setup.py @@ -110,3 +110,12 @@ version_info = { 'revno': %s } """ % (branch_nick, revid, revno)) + + +def write_git_changelog(): + if os.path.isdir('.git'): + git_log_gnu = 'git log --format="%ai %aN %n%n%x09* %s%d%n"' + changelog = run_git_command(git_log_gnu) + mailmap = parse_mailmap() + with open("ChangeLog", "w") as changelog_file: + changelog_file.write(str_dict_replace(changelog, mailmap)) diff --git a/setup.py b/setup.py index dafd5793..76b57225 100644 --- a/setup.py +++ b/setup.py @@ -26,12 +26,11 @@ from setuptools import setup gettext.install('melange', unicode=1) -from melange.openstack.common.setup import parse_mailmap, str_dict_replace from melange.openstack.common.setup import parse_requirements from melange.openstack.common.setup import parse_dependency_links from melange.openstack.common.setup import write_requirements from melange.openstack.common.setup import write_vcsversion -from melange.openstack.common.setup import run_git_command +from melange.openstack.common.setup import write_git_changelog from melange import version @@ -39,15 +38,8 @@ from melange import version class local_sdist(sdist): """Customized sdist hook - builds the ChangeLog file from VC first""" def run(self): - if os.path.isdir('.git'): - git_log_gnu = 'git log --format="%ai %aN %n%n%x09* %s%d%n"' - changelog = run_git_command(git_log_gnu) - mailmap = parse_mailmap() - with open("ChangeLog", "w") as changelog_file: - changelog_file.write(str_dict_replace(changelog, mailmap)) + write_git_changelog() sdist.run(self) - - cmdclass = {'sdist': local_sdist}