Merge pull request #268 from ababic/release-prep/2.11.1

Release prep for 2.11.1
jazzband · Sep 10, 2018 · 4ef0f38 · 4ef0f38
2 parents a525d8e + b91e9f7
commit 4ef0f38
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,11 +15,11 @@ matrix:
     sudo: false
     dist: trusty
     python: 3.6
-  - env: TOXENV=py37-dj2-wt2
-    sudo: true
-    dist: xenial
-    python: 3.7
-  - env: TOXENV=py37-dj2-wt21
+  - env: TOXENV=py36-dj2-wt21
+    sudo: false
+    dist: trusty
+    python: 3.6
+  - env: TOXENV=py37-dj2-wt22
     sudo: true
     dist: xenial
     python: 3.7
@@ -42,4 +42,4 @@ deploy:
     tags: true
     branch: master
     repo: rkhleics/wagtailmenus
-    condition: "$TOXENV = py37-dj2-wt21"
+    condition: "$TOXENV = py37-dj2-wt22"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,16 @@ Changelog
 2.12.0 (XX.XX.XXXX)
 -------------------
 
-* Fix an issue with the release notes section menu in docs.
-* Updated Travis CI to deploy to PyPi automatically when commits are tagged appropriately.
-* Pinned django-cogwheels dependency version to 0.2.
+* TBA
+
+
+2.11.1 (10.09.2018)
+-------------------
+
+* Fixed an issue with the section menu in the release notes section of the docs.
+* Updated tox config to test against Python 3.7 and Wagtail 2.2.
+* Updated Travis CI config to deploy to PyPi automatically when commits are tagged appropriately.
+* Pinned django-cogwheels dependency to version 0.2 to reduce potential for backwards-incompatibility issues.
 
 
 2.11.0 (15.07.2018)

diff --git a/README.rst b/README.rst
@@ -23,7 +23,7 @@ wagtailmenus is an extension for Torchbox's `Wagtail CMS <https://github.com/tor
 
 The current version is tested for compatiblily with the following: 
 
-- Wagtail versions 2.0 to 2.1
+- Wagtail versions 2.0 to 2.2
 - Django versions 1.11 to 2.0
 - Python versions 3.4 to 3.7
 

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -7,7 +7,7 @@ wagtailmenus is an open-source extension for `Wagtail CMS
 
 The current version is tested for compatibility with the following: 
 
-- Wagtail versions 2.0 to 2.1
+- Wagtail versions 2.0 to 2.2
 - Django versions 1.11 to 2.0
 - Python versions 3.4 to 3.7
 

diff --git a/docs/source/releases/2.11.1.rst b/docs/source/releases/2.11.1.rst
@@ -0,0 +1,10 @@
+=================================
+Wagtailmenus 2.11.1 release notes
+=================================
+
+This is a minor release to solve a few non code-related issues:
+
+- Fixed an issue with the section menu in the release notes section of the docs.
+- Updated tox config to test against Python 3.7 and Wagtail 2.2
+- Updated Travis CI config to deploy to PyPi automatically when commits are tagged appropriately.
+- Pinned django-cogwheels dependency to version 0.2 to reduce potential for backwards-incompatibility issues.
diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst
@@ -6,6 +6,7 @@ Release notes
     :maxdepth: 1
 
     2.12
+    2.11.1
     2.11
     2.10.0
     2.9.0

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ skipsdist = True
 usedevelop = True
 
 envlist = 
-    py{34,35,36,37}-dj{111,2}-wt{2,21}
+    py{34,35,36,37}-dj{111,2}-wt{2,21,22}
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -20,3 +20,4 @@ deps =
     dj2: Django>=2.0,<2.1
     wt2: wagtail>=2.0,<2.1
     wt21: wagtail>=2.1,<2.2
+    wt22: wagtail>=2.2,<2.3
diff --git a/wagtailmenus/__init__.py b/wagtailmenus/__init__.py
@@ -2,7 +2,7 @@
 
 # major.minor.patch.release.number
 # release must be one of alpha, beta, rc, or final
-VERSION = (2, 11, 0, 'final', 0)
+VERSION = (2, 11, 1, 'final', 0)
 __version__ = get_version(VERSION)
 stable_branch_name = get_stable_branch_name(VERSION)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ Release notes @@
         :maxdepth: 1
 .12
+.11.1
 .11
 .10.0
 .9.0
@@ Expand Down @@