From 5cf13093ea55318160bb9de604f61c9ff69faff8 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Thu, 30 Jul 2015 03:34:17 -0400 Subject: [PATCH] Version bump for 0.5. Nicer commit message for release merges. --- CHANGELOG | 4 ++++ docs/changelog.rst | 8 ++++++++ mwparserfromhell/__init__.py | 2 +- scripts/release.sh | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index add76d5..d95b3a3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +v0.5 (unreleased): + +- + v0.4.2 (released July 30, 2015): - Fixed setup script not including header files in releases. diff --git a/docs/changelog.rst b/docs/changelog.rst index b37bc9a..acb09fc 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,14 @@ Changelog ========= +v0.5 +---- + +Unreleased +(`changes `__): + +- + v0.4.2 ------ diff --git a/mwparserfromhell/__init__.py b/mwparserfromhell/__init__.py index 2f6d2c2..2611813 100644 --- a/mwparserfromhell/__init__.py +++ b/mwparserfromhell/__init__.py @@ -29,7 +29,7 @@ outrageously powerful parser for `MediaWiki `_ wikicode. __author__ = "Ben Kurtovic" __copyright__ = "Copyright (C) 2012, 2013, 2014, 2015 Ben Kurtovic" __license__ = "MIT License" -__version__ = "0.4.2" +__version__ = "0.5.dev0" __email__ = "ben.kurtovic@gmail.com" from . import (compat, definitions, nodes, parser, smart_list, string_mixin, diff --git a/scripts/release.sh b/scripts/release.sh index dd4e1d4..1171718 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -65,7 +65,7 @@ do_git_stuff() { git commit -qam "release/$VERSION" git tag v$VERSION -s -m "version $VERSION" git checkout -q master - git merge -q --no-ff develop -m "Merge branch 'develop'" + git merge -q --no-ff develop -m "Merge develop into master (release/$VERSION)" echo -n " pushing..." git push -q --tags origin master git checkout -q develop