Merge pull request #92 from AccentDesign/wagtail_2_1

update to wagtail 2.1
labd · May 23, 2018 · 66bebf0 · 66bebf0
2 parents 3f754d0 + febb796
commit 66bebf0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,6 +7,11 @@ master
 
 * in development
 
+2.1.0
+-----
+
+* Update to Wagtail 2.1
+
 2.0.1
 -----
 

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 install_requires = [
     'Django>=2,<2.1',
     'django-recaptcha>=1.3.1',
-    'wagtail>=2,<2.1'
+    'wagtail>=2,<2.2'
 ]
 
 documentation_extras = [

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

diff --git a/wagtailstreamforms/__init__.py b/wagtailstreamforms/__init__.py
@@ -1 +1 @@
-__version__ = '2.0.1'
+__version__ = '2.1.0'
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,11 @@ master @@
     * in development
+.1.0
+    -----
+    * Update to Wagtail 2.1
 .0.1
     -----
@@ Expand Down @@