Merge pull request labd#101 from AccentDesign/wagtail_2_2

update wagtail to 2.2
AccentDesign · Aug 10, 2018 · 462be3f · 462be3f
2 parents 95485b7 + a53d953
commit 462be3f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog
 *********
 
+3.1.0
+-----
+
+Support for Wagtail 2.2
+
 3.0.0
 -----
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
 # The app itself
 -e .
 
+Django>=1.11,<2.1
 mock
 psycopg2-binary
 

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 
 install_requires = [
-    'wagtail>=2,<2.2'
+    'wagtail>=2,<2.3'
 ]
 
 documentation_extras = [

diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,7 @@
 envlist =
     deps
     flake8
-    py{34,35,36}-dj{200}-wt{200}
-    py{34,35,36}-dj{200}-wt{201}
+    py{34,35,36}-dj{200}-wt{200,201,202}
 
 [testenv]
 deps =
@@ -13,6 +12,7 @@ deps =
     dj200: Django>=2,<2.1
     wt200: wagtail>=2,<2.1
     wt201: wagtail>=2.1,<2.2
+    wt202: wagtail>=2.2,<2.3
 
 commands =
     coverage erase

diff --git a/wagtailstreamforms/__init__.py b/wagtailstreamforms/__init__.py
@@ -2,6 +2,6 @@
 
 # major.minor.patch.release.number
 # release must be one of alpha, beta, rc, or final
-VERSION = (3, 0, 0, 'final', 0)
+VERSION = (3, 1, 0, 'final', 0)
 
 __version__ = get_version(VERSION)