From 86ce571b93574feb9a8045dd56b446a02b6cfc15 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 30 Jul 2018 21:18:44 +0100 Subject: [PATCH] Version bump to 2.2rc1 --- docs/releases/upgrading.rst | 2 ++ wagtail/__init__.py | 2 +- wagtail/project_template/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/releases/upgrading.rst b/docs/releases/upgrading.rst index 3494bfa3ec..fdf389f74c 100644 --- a/docs/releases/upgrading.rst +++ b/docs/releases/upgrading.rst @@ -131,4 +131,6 @@ The compatible versions of Django and Python for each Wagtail release are: +-------------------+------------------------------+-----------------------------+ | 2.1 | 1.11, 2.0 | 3.4, 3.5, 3.6 | +-------------------+------------------------------+-----------------------------+ +| 2.2 | 1.11, 2.0 | 3.4, 3.5, 3.6 | ++-------------------+------------------------------+-----------------------------+ diff --git a/wagtail/__init__.py b/wagtail/__init__.py index 371bd51975..c1369c39ad 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, 2, 0, 'alpha', 0) +VERSION = (2, 2, 0, 'rc', 1) __version__ = get_version(VERSION) diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index 54c21019fb..a688b9cbec 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,2 +1,2 @@ Django>=2.0,<2.1 -wagtail==2.2a0 +wagtail==2.2rc1