diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-02-23 09:57:51 +0300 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-02-23 09:57:51 +0300 |
| commit | d98b2f05a3056fe9798eb0b67233d2702d846d2f (patch) | |
| tree | d49083e69f14bea631ce4afa4296dcce61bceb77 /utils | |
| parent | 583667701e955e354082a60e9305e77252a4c351 (diff) | |
utils/bump_version: Remove empty sections from CHANGES automatically
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/bump_version.py | 5 | ||||
| -rw-r--r-- | utils/release-checklist | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/utils/bump_version.py b/utils/bump_version.py index 6491a38e3..b829877b6 100755 --- a/utils/bump_version.py +++ b/utils/bump_version.py @@ -114,7 +114,7 @@ class Changes: f.truncate(0) f.write(heading + '\n') f.write('=' * len(heading) + '\n') - f.write(body) + f.write(self.filter_empty_sections(body)) def add_release(self, version_info): if version_info[-2:] in (('beta', 0), ('final', 0)): @@ -142,6 +142,9 @@ class Changes: f.write('\n') f.write(body) + def filter_empty_sections(self, body): + return re.sub('^\n.+\n-{3,}\n+(?=\n.+\n[-=]{3,}\n)', '', body, flags=re.M) + def parse_options(argv): parser = argparse.ArgumentParser() diff --git a/utils/release-checklist b/utils/release-checklist index 12cbe6381..171fe50fc 100644 --- a/utils/release-checklist +++ b/utils/release-checklist @@ -8,7 +8,6 @@ for stable releases * Run ``git fetch; git status`` and check nothing changed * ``python utils/bump_version.py X.Y.Z`` * Check diff by ``git diff`` -* Edit CHANGES if empty section exists * ``git commit -am 'Bump to X.Y.Z final'`` * ``make clean`` * ``python setup.py release bdist_wheel sdist`` @@ -36,7 +35,6 @@ for first beta releases * Run ``(cd sphinx/locale; tx push -s)`` * ``python utils/bump_version.py X.Y.0b1`` * Check diff by ``git diff`` -* Edit CHANGES if empty section exists * ``git commit -am 'Bump to X.Y.0 beta1'`` * ``make clean`` * ``python setup.py release bdist_wheel sdist`` @@ -67,7 +65,6 @@ for other beta releases * Run ``git fetch; git status`` and check nothing changed * ``python utils/bump_version.py X.Y.0bN`` * Check diff by ``git diff`` -* Edit CHANGES if empty section exists * ``git commit -am 'Bump to X.Y.0 betaN'`` * ``make clean`` * ``python setup.py release bdist_wheel sdist`` @@ -97,7 +94,6 @@ for major releases * Run ``git commit -am 'Update message catalogs'`` * ``python utils/bump_version.py X.Y.0`` * Check diff by ``git diff`` -* Edit CHANGES if empty section exists * ``git commit -am 'Bump to X.Y.0 final'`` * ``make clean`` * ``python setup.py release bdist_wheel sdist`` |