From 95209b9c21a545154e69c02552250f57818a4e01 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Sun, 16 May 2021 02:28:23 -0400 Subject: [PATCH 1/2] Fix release error --- CHANGELOG | 3 ++- appveyor.yml | 2 +- docs/changelog.rst | 9 +++++---- scripts/release.sh | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dd2f809..3f97e9c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,10 @@ -v0.6.1 (released May 16, 2021): +v0.7 (unreleased): - Improved parsing of external links. (#232) - Fixed parsing of nested wikilinks. - Ported tests to pytest. (#237) - Moved mwparserfromhell package to src/ dir. +- There was no 0.6.1 release due to a packaging error. v0.6 (released December 21, 2020): diff --git a/appveyor.yml b/appveyor.yml index 48c10eb..5f89a41 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ # This config file is used by appveyor.com to build Windows release binaries -version: 0.6.1-b{build} +version: 0.7.dev0-b{build} branches: only: diff --git a/docs/changelog.rst b/docs/changelog.rst index 7940881..4c209c1 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,11 +1,11 @@ Changelog ========= -v0.6.1 ------- +v0.7 +---- -`Released May 16, 2021 `_ -(`changes `__): +Unreleased +(`changes `__): - Improved parsing of external links. (`#232 `_) @@ -13,6 +13,7 @@ v0.6.1 - Ported tests to pytest. (`#237 `_) - Moved mwparserfromhell package to src/ dir. +- There was no 0.6.1 release due to a packaging error. v0.6 ---- diff --git a/scripts/release.sh b/scripts/release.sh index 48908ca..257b963 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -5,6 +5,8 @@ if [[ -z "$1" ]]; then exit 1 fi +set -euo pipefail + VERSION=$1 SCRIPT_DIR=$(dirname "$0") RELEASE_DATE=$(date +"%B %-d, %Y") @@ -27,7 +29,7 @@ check_git() { update_version() { echo -n "Updating mwparserfromhell.__version__..." - sed -e 's/__version__ = .*/__version__ = "'$VERSION'"/' -i "" mwparserfromhell/__init__.py + sed -e 's/__version__ = .*/__version__ = "'$VERSION'"/' -i "" src/mwparserfromhell/__init__.py echo " done." } From 439e4c6d5055172a13ff5e79f734911d218aade7 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Sun, 16 May 2021 02:30:48 -0400 Subject: [PATCH 2/2] release/0.6.2 --- CHANGELOG | 2 +- appveyor.yml | 2 +- docs/changelog.rst | 8 ++++---- src/mwparserfromhell/__init__.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3f97e9c..0ae6fcf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -v0.7 (unreleased): +v0.6.2 (released May 16, 2021): - Improved parsing of external links. (#232) - Fixed parsing of nested wikilinks. diff --git a/appveyor.yml b/appveyor.yml index 5f89a41..85bca1c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ # This config file is used by appveyor.com to build Windows release binaries -version: 0.7.dev0-b{build} +version: 0.6.2-b{build} branches: only: diff --git a/docs/changelog.rst b/docs/changelog.rst index 4c209c1..827cb01 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,11 +1,11 @@ Changelog ========= -v0.7 ----- +v0.6.2 +------ -Unreleased -(`changes `__): +`Released May 16, 2021 `_ +(`changes `__): - Improved parsing of external links. (`#232 `_) diff --git a/src/mwparserfromhell/__init__.py b/src/mwparserfromhell/__init__.py index dd4eb2b..917d26c 100644 --- a/src/mwparserfromhell/__init__.py +++ b/src/mwparserfromhell/__init__.py @@ -27,7 +27,7 @@ outrageously powerful parser for `MediaWiki `_ wikico __author__ = "Ben Kurtovic" __copyright__ = "Copyright (C) 2012-2021 Ben Kurtovic" __license__ = "MIT License" -__version__ = "0.7.dev0" +__version__ = "0.6.2" __email__ = "ben.kurtovic@gmail.com" from . import (definitions, nodes, parser, smart_list, string_mixin,