From c55eed9e99640fd38f86ca99007670dead607892 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 23 May 2016 15:17:58 +0100 Subject: [PATCH] Version bump to start work on 1.6 --- CHANGELOG.txt | 4 ++++ docs/releases/1.6.rst | 24 +++++++++++++++++++++++ docs/releases/index.rst | 1 + wagtail/project_template/requirements.txt | 2 +- wagtail/wagtailcore/__init__.py | 4 ++-- 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 docs/releases/1.6.rst diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8ae1b448c0..b1b2a9dc40 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,10 @@ Changelog ========= +1.6 (xx.xx.xxxx) - IN DEVELOPMENT +~~~~~~~~~~~~~~~~ + + 1.5 (xx.xx.xxxx) ~~~~~~~~~~~~~~~~ diff --git a/docs/releases/1.6.rst b/docs/releases/1.6.rst new file mode 100644 index 0000000000..b68f86626d --- /dev/null +++ b/docs/releases/1.6.rst @@ -0,0 +1,24 @@ +========================================== +Wagtail 1.6 release notes - IN DEVELOPMENT +========================================== + +.. contents:: + :local: + :depth: 1 + + +What's new +========== + + +Minor features +~~~~~~~~~~~~~~ + + +Bug fixes +~~~~~~~~~ + + +Upgrade considerations +====================== + diff --git a/docs/releases/index.rst b/docs/releases/index.rst index 67780f27ad..8ed4b2c6f5 100644 --- a/docs/releases/index.rst +++ b/docs/releases/index.rst @@ -4,6 +4,7 @@ Release notes .. toctree:: :maxdepth: 1 + 1.6 1.5 1.4.5 1.4.4 diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index 756228a08f..884f9191e2 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,2 +1,2 @@ Django>=1.9,<1.10 -wagtail==1.5rc1 +wagtail==1.6a0 diff --git a/wagtail/wagtailcore/__init__.py b/wagtail/wagtailcore/__init__.py index 1b531e4c8f..952c73fae7 100644 --- a/wagtail/wagtailcore/__init__.py +++ b/wagtail/wagtailcore/__init__.py @@ -1,6 +1,6 @@ -__version__ = '1.5rc1' +__version__ = '1.6a1' # Required for npm package for frontend -__semver__ = '1.5.0-rc.1' +__semver__ = '1.6.0-alpha' default_app_config = 'wagtail.wagtailcore.apps.WagtailCoreAppConfig'