Release prep/3.0.1 (#360)

jazzband · Feb 8, 2020 · 37e305b · 37e305b
1 parent ddbc737
commit 37e305b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,18 +16,18 @@ matrix:
     python: 3.7
   - env: TOXENV=py37-dj2-wt22
     python: 3.7
-  - env: TOXENV=py37-dj21-wt23
+  - env: TOXENV=py37-dj2-wt23
     python: 3.7
-  - env: TOXENV=py37-dj21-wt24
+  - env: TOXENV=py37-dj2-wt24
     python: 3.7
   - env: TOXENV=py37-dj22-wt25
     python: 3.7
   - env: TOXENV=py37-dj22-wt26
     python: 3.7
-  - env: TOXENV=py37-dj22-wt27
-    python: 3.7
   - env: TOXENV=py38-dj22-wt27
     python: 3.8
+  - env: TOXENV=py38-dj3-wt28
+    python: 3.8
 
 install:
 - pip install tox codecov
@@ -40,11 +40,11 @@ after_success:
 
 deploy:
   provider: pypi
-  user: ababic
+  user: ${PYPI_USER}
   distributions: sdist bdist_wheel
   password: ${PYPI_PASSWORD}
   on:
     tags: true
     branch: master
     repo: rkhleics/wagtailmenus
-    condition: "$TOXENV = py37-dj22-wt25"
+    condition: "$TOXENV=py38-dj22-wt27"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+3.0.1 (08.02.2020)
+------------------
+
+* Added support for Django 3.0 and Wagtail 2.8 (thanks to Arkadiusz Michał Ryś).
+
+
 3.0 (07.11.2019)
 ----------------
 

diff --git a/README.rst b/README.rst
@@ -23,8 +23,8 @@ 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.7
-- Django versions 1.11 to 2.2
+- Wagtail versions 2.0 to 2.8
+- Django versions 1.11, 2.0, 2.2 and 3.0
 - Python versions 3.4 to 3.8
 
 .. image:: https://raw.githubusercontent.com/rkhleics/wagtailmenus/master/docs/source/_static/images/repeating-item.png

diff --git a/docs/requirements.txt b/docs/requirements.txt
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -7,8 +7,8 @@ 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.7
-- Django versions 1.11 to 2.2
+- Wagtail versions 2.0 to 2.8
+- Django versions 1.11, 2.0, 2.2 and 3.0
 - Python versions 3.4 to 3.8
 
 To find out more about what wagtailmenus does and why, see :doc:`overview`

diff --git a/docs/source/releases/3.0.1.rst b/docs/source/releases/3.0.1.rst
@@ -0,0 +1,6 @@
+================================
+Wagtailmenus 3.0.1 release notes
+================================
+
+This release includes minor changes to add compatibility with Django 3.0
+and Wagtail 2.8 (thanks to Arkadiusz Michał Ryś).
diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst
@@ -5,6 +5,7 @@ Release notes
 .. toctree::
     :maxdepth: 1
 
+    3.0.1
     3.0
     2.13.1
     2.13

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,21}-wt{2,21,22,23,24,25,26,27}
+    py{34,35,36,37}-dj{111,2,22,3}-wt{2,21,22,23,24,25,26,27,28}
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -19,7 +19,6 @@ basepython =
 deps =
     dj111: Django>=1.11,<2.1
     dj2: Django>=2.0,<2.1
-    dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<3.0
     wt2: wagtail>=2.0,<2.1
     wt21: wagtail>=2.1,<2.2
@@ -28,4 +27,5 @@ deps =
     wt24: wagtail>=2.4,<2.5
     wt25: wagtail>=2.5,<2.6
     wt26: wagtail>=2.6,<2.7
-    wt27: wagtail==2.7rc2
+    wt27: wagtail>=2.7,<2.8
+    wt28: wagtail>=2.8,<2.9
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 = (3, 0, 0, "final", 0)
+VERSION = (3, 0, 1, "final", 0)
 __version__ = get_version(VERSION)
 stable_branch_name = get_stable_branch_name(VERSION)
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ Release notes @@
     .. toctree::
         :maxdepth: 1
+.0.1
 .0
 .13.1
 .13
@@ Expand Down @@