Browse Source

Merge develop into master (release/0.6.2)

undefined
Ben Kurtovic 3 years ago
parent
commit
c5adee1189
5 changed files with 11 additions and 7 deletions
  1. +2
    -1
      CHANGELOG
  2. +1
    -1
      appveyor.yml
  3. +4
    -3
      docs/changelog.rst
  4. +3
    -1
      scripts/release.sh
  5. +1
    -1
      src/mwparserfromhell/__init__.py

+ 2
- 1
CHANGELOG View File

@@ -1,9 +1,10 @@
v0.6.1 (released May 16, 2021):
v0.6.2 (released May 16, 2021):


- Improved parsing of external links. (#232) - Improved parsing of external links. (#232)
- Fixed parsing of nested wikilinks. - Fixed parsing of nested wikilinks.
- Ported tests to pytest. (#237) - Ported tests to pytest. (#237)
- Moved mwparserfromhell package to src/ dir. - Moved mwparserfromhell package to src/ dir.
- There was no 0.6.1 release due to a packaging error.


v0.6 (released December 21, 2020): v0.6 (released December 21, 2020):




+ 1
- 1
appveyor.yml View File

@@ -1,6 +1,6 @@
# This config file is used by appveyor.com to build Windows release binaries # This config file is used by appveyor.com to build Windows release binaries


version: 0.6.1-b{build}
version: 0.6.2-b{build}


branches: branches:
only: only:


+ 4
- 3
docs/changelog.rst View File

@@ -1,11 +1,11 @@
Changelog Changelog
========= =========


v0.6.1
v0.6.2
------ ------


`Released May 16, 2021 <https://github.com/earwig/mwparserfromhell/tree/v0.6.1>`_
(`changes <https://github.com/earwig/mwparserfromhell/compare/v0.6...v0.6.1>`__):
`Released May 16, 2021 <https://github.com/earwig/mwparserfromhell/tree/v0.6.2>`_
(`changes <https://github.com/earwig/mwparserfromhell/compare/v0.6...v0.6.2>`__):


- Improved parsing of external links. - Improved parsing of external links.
(`#232 <https://github.com/earwig/mwparserfromhell/issues/232>`_) (`#232 <https://github.com/earwig/mwparserfromhell/issues/232>`_)
@@ -13,6 +13,7 @@ v0.6.1
- Ported tests to pytest. - Ported tests to pytest.
(`#237 <https://github.com/earwig/mwparserfromhell/issues/237>`_) (`#237 <https://github.com/earwig/mwparserfromhell/issues/237>`_)
- Moved mwparserfromhell package to src/ dir. - Moved mwparserfromhell package to src/ dir.
- There was no 0.6.1 release due to a packaging error.


v0.6 v0.6
---- ----


+ 3
- 1
scripts/release.sh View File

@@ -5,6 +5,8 @@ if [[ -z "$1" ]]; then
exit 1 exit 1
fi fi


set -euo pipefail

VERSION=$1 VERSION=$1
SCRIPT_DIR=$(dirname "$0") SCRIPT_DIR=$(dirname "$0")
RELEASE_DATE=$(date +"%B %-d, %Y") RELEASE_DATE=$(date +"%B %-d, %Y")
@@ -27,7 +29,7 @@ check_git() {


update_version() { update_version() {
echo -n "Updating mwparserfromhell.__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." echo " done."
} }




+ 1
- 1
src/mwparserfromhell/__init__.py View File

@@ -27,7 +27,7 @@ outrageously powerful parser for `MediaWiki <https://www.mediawiki.org>`_ wikico
__author__ = "Ben Kurtovic" __author__ = "Ben Kurtovic"
__copyright__ = "Copyright (C) 2012-2021 Ben Kurtovic" __copyright__ = "Copyright (C) 2012-2021 Ben Kurtovic"
__license__ = "MIT License" __license__ = "MIT License"
__version__ = "0.7.dev0"
__version__ = "0.6.2"
__email__ = "ben.kurtovic@gmail.com" __email__ = "ben.kurtovic@gmail.com"


from . import (definitions, nodes, parser, smart_list, string_mixin, from . import (definitions, nodes, parser, smart_list, string_mixin,


Loading…
Cancel
Save