From e0fd29da32e5455b2b47a51974416fd419aeb4fe Mon Sep 17 00:00:00 2001
From: Mads Jensen <mje@inducks.org>
Date: Thu, 26 Sep 2019 20:28:05 +0200
Subject: [PATCH] Added Django 2.2 and Django 3.0 to supported versions table.

---
 .travis.yml | 39 +++++++++------------------------------
 README.rst  |  6 ++++--
 tox.ini     | 10 +++-------
 3 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8827f05..9178900a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,11 @@
-#cache: pip
+cache: pip
 
 language: python
 
 matrix:
   include:
   - python: 3.5
-    dist: trusty
-    sudo: false
-    env: DJANGO="1.11"
-  - python: 3.5
-    dist: trusty
-    sudo: false
-    env: DJANGO="2.0"
-  - python: 3.5
-    dist: trusty
+    dist: xenial
     sudo: false
     env: DJANGO="2.1"
   - python: 3.5
@@ -22,39 +14,26 @@ matrix:
     env: DJANGO="2.2"
 
   - python: 3.6
-    dist: trusty
-    sudo: false
-    env: DJANGO="1.11"
-  - python: 3.6
-    dist: trusty
-    sudo: false
-    env: DJANGO="2.0"
-  - python: 3.6
-    dist: trusty
+    dist: xenial
     sudo: false
     env: DJANGO="2.1"
   - python: 3.6
     dist: xenial
     sudo: false
     env: DJANGO="2.2"
-
-  - python: 3.7
+  - python: 3.6
     dist: xenial
-    sudo: true
-    env: DJANGO="2.0"
+    sudo: false
+    env: DJANGO="3.0"
+
   - python: 3.7
     dist: xenial
     sudo: true
-    env: DJANGO="2.1"
+    env: DJANGO="2.2"
   - python: 3.7
     dist: xenial
     sudo: true
-    env: DJANGO="2.2"
-
-  - python: pypy
-    dist: trusty
-    sudo: false
-    env: DJANGO="1.11"
+    env: DJANGO="3.0"
 
 addons:
   apt:
diff --git a/README.rst b/README.rst
index 80e98346..38dd2aed 100644
--- a/README.rst
+++ b/README.rst
@@ -26,6 +26,8 @@ The below table explains which Django versions are supported.
 +------------------+----------------+--------------+
 | Release          | Django         | Upgrade from |
 +==================+================+==============+
+| 0.5.x (DEV)      | 2.1, 2.2, 3.0  | 0.4          |
++------------------+----------------+--------------+
 | 0.4.x            | 1.11, 2.0, 2.1 | 0.3          |
 +------------------+----------------+--------------+
 | 0.3.x            | 1.8, 1.9,      | 0.2          |
@@ -128,7 +130,7 @@ Docs
 
 See the docs/ folder, or read them at:
 
-http://django-wiki.readthedocs.io/en/latest/
+https://django-wiki.readthedocs.io/en/latest/
 
 If you wish to add something, please ask in the google group or raise an
 issue if you're in doubt about whether something might change.
@@ -183,7 +185,7 @@ on your host system.
 -  `django-sekizai <https://github.com/ojii/django-sekizai/>`__
 -  `sorl-thumbnail <https://github.com/mariocesar/sorl-thumbnail>`__
 -  `Pillow (Python Imaging Library) <https://pillow.readthedocs.io/en/latest/installation.html>`__
--  Python>=3.4
+-  Python>=3.5
 
 
 
diff --git a/tox.ini b/tox.ini
index e56ce282..8b0f69bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # Ensure you add to .travis.yml if you add here, using `tox -l`
-envlist = {py35,py36}-django{111,20,21,22},py37-django{20,21,22},lint
+envlist = {py35,py36,py37}-django{21,22},{py36,py37,py38}-django{30},lint
 
 [travis]
 python =
@@ -10,10 +10,8 @@ python =
 
 [travis:env]
 DJANGO =
-  1.11: django111
-  2.0: django20
-  2.1: django21
   2.2: django22
+  3.0: django30
 LINT =
   yes: lint
 
@@ -34,17 +32,15 @@ usedevelop = false
 
 deps =
   .[test]
-  django111: Django>=1.11,<2.0
-  django20: Django>=2.0,<2.1
   django21: Django>=2.1,<2.2
   django22: Django>=2.2,<2.3
+  django30: Django>=3.0a1,<3.1
 
 basepython =
   py35: python3.5
   py36: python3.6
   py37: python3.7
 
-
 [testenv:lint]
 basepython = python3
 deps = .[testlint]
-- 
2.45.2