From 31616756b3cb76e728e115f4c13b3900000ae7ec Mon Sep 17 00:00:00 2001 From: Andy Babic Date: Sat, 14 Oct 2017 20:29:12 +0100 Subject: [PATCH] Update from 2.5rc1 to 2.5.0 (final) --- CHANGELOG.md | 8 ++++++-- docs/source/releases/{2.5rc1.rst => 2.5.0.rst} | 5 +---- docs/source/releases/index.rst | 2 +- wagtailmenus/__init__.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) rename docs/source/releases/{2.5rc1.rst => 2.5.0.rst} (98%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cb8349bb..16cc15c0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ Changelog ========= -2.5.0a (XX.XX.XXXX) IN DEVELOPMENT ----------------------------------- +2.X.X (XX.XX.XXXX) IN DEVELOPMENT +--------------------------------- + + +2.5.0 (14.10.2017) +------------------ * Added rendering logic to Menu classes and refactored all existing template tags to make use of it (massively reducing code duplication in menu_tags.py). diff --git a/docs/source/releases/2.5rc1.rst b/docs/source/releases/2.5.0.rst similarity index 98% rename from docs/source/releases/2.5rc1.rst rename to docs/source/releases/2.5.0.rst index 2280a8781..c733a233f 100644 --- a/docs/source/releases/2.5rc1.rst +++ b/docs/source/releases/2.5.0.rst @@ -1,10 +1,7 @@ ================================= -Wagtailmenus 2.5rc1 release notes +Wagtailmenus 2.5.0 release notes ================================= -.. NOTE:: - This is a release candidate version. Please report any bugs or issues to the tracker at https://github.com/rkhleics/wagtailmenus/issues - .. contents:: :local: :depth: 1 diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst index 292f7cdff..b254ae3bc 100644 --- a/docs/source/releases/index.rst +++ b/docs/source/releases/index.rst @@ -5,7 +5,7 @@ Release notes .. toctree:: :maxdepth: 1 - 2.5rc1 + 2.5.0 2.4.0 2.3.2 2.3.1 diff --git a/wagtailmenus/__init__.py b/wagtailmenus/__init__.py index 6da297fa5..894b2ebb6 100644 --- a/wagtailmenus/__init__.py +++ b/wagtailmenus/__init__.py @@ -3,7 +3,7 @@ # major.minor.patch.release.number # release must be one of alpha, beta, rc, or final -VERSION = (2, 5, 0, 'rc', 1) +VERSION = (2, 5, 0, 'final', 0) __version__ = get_version(VERSION) stable_branch_name = get_stable_branch_name(VERSION)