From e20f37013bb786f5834b263e2b557819814d392f Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 30 Jan 2018 16:36:19 +0000 Subject: [PATCH] Version bump to start work on 2.1 --- CHANGELOG.txt | 4 ++++ docs/releases/2.1.rst | 23 +++++++++++++++++++++++ docs/releases/index.rst | 1 + wagtail/__init__.py | 2 +- wagtail/project_template/requirements.txt | 2 +- 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 docs/releases/2.1.rst diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a5927d9779..30d043676e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,10 @@ Changelog ========= +2.1 (xx.xx.xxxx) - IN DEVELOPMENT +~~~~~~~~~~~~~~~~ + + 2.0 (xx.xx.xxxx) - IN DEVELOPMENT ~~~~~~~~~~~~~~~~ diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst new file mode 100644 index 0000000000..f086392286 --- /dev/null +++ b/docs/releases/2.1.rst @@ -0,0 +1,23 @@ +========================================== +Wagtail 2.1 release notes - IN DEVELOPMENT +========================================== + +.. contents:: + :local: + :depth: 1 + + +What's new +========== + + +Other features +~~~~~~~~~~~~~~ + + +Bug fixes +~~~~~~~~~ + + +Upgrade considerations +====================== diff --git a/docs/releases/index.rst b/docs/releases/index.rst index 952fa22028..779606233d 100644 --- a/docs/releases/index.rst +++ b/docs/releases/index.rst @@ -5,6 +5,7 @@ Release notes :maxdepth: 1 upgrading + 2.1 2.0 1.13.1 1.13 diff --git a/wagtail/__init__.py b/wagtail/__init__.py index 551f57c35f..9e8c170c0b 100644 --- a/wagtail/__init__.py +++ b/wagtail/__init__.py @@ -2,7 +2,7 @@ from wagtail.utils.version import get_semver_version, get_version # major.minor.patch.release.number # release must be one of alpha, beta, rc, or final -VERSION = (2, 0, 0, 'beta', 1) +VERSION = (2, 1, 0, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index bad5a2a7df..4c707bb757 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,2 +1,2 @@ Django>=2.0,<2.1 -wagtail==2.0b1 +wagtail==2.1a0