From d579f21046dcb4e646a18c9e17981e744e2a68f4 Mon Sep 17 00:00:00 2001
From: Fabre Florian <ffabre@hybird.org>
Date: Mon, 15 Apr 2019 20:27:15 +0200
Subject: [PATCH 1/2] Add tox targets for Django 2.2. Update changelogs

---
 .travis.yml  | 66 ++++++++--------------------------------------------
 CHANGELOG.md |  2 +-
 README.rst   |  2 +-
 tox.ini      | 20 ++++++++++------
 4 files changed, 25 insertions(+), 65 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39a36ec..fb4f7ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,64 +1,18 @@
+dist: xenial
 sudo: false
 language: python
-matrix:
-  fast_finish: true
-  include:
-    # Python version is just for the look on travis.
-    - python: 2.7
-      env: TOXENV=flake8-py27
-
-    - python: 3.5
-      env: TOXENV=flake8-py35
-
-    - python: 2.7
-      env: TOXENV=py27-django111
-
-    - python: 3.5
-      env: TOXENV=py35-django111
-
-    - python: 3.5
-      env: TOXENV=py35-django20
-
-    - python: 3.5
-      env: TOXENV=py35-django21
-
-    - python: 3.5
-      env: TOXENV=py35-djangomaster
 
-    - python: 3.6
-      env: TOXENV=py36-django111
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.7
 
-    - python: 3.6
-      env: TOXENV=py36-django20
-
-    - python: 3.6
-      env: TOXENV=py36-django21
-  
-    - python: 3.6
-      env: TOXENV=py36-djangomaster
-
-    - python: 3.7
-      env: TOXENV=py37-django20
-      dist: xenial
-      sudo: true
-
-    - python: 3.7
-      env: TOXENV=py37-django21
-      dist: xenial
-      sudo: true
-
-    - python: 3.7
-      env: TOXENV=py37-djangomaster
-      dist: xenial
-      sudo: true
-
-  allow_failures:
-    - env: TOXENV=py35-djangomaster
-    - env: TOXENV=py36-djangomaster
-    - env: TOXENV=py37-djangomaster
+matrix:
+  fast_finish: true
 
 install:
-    - pip install tox
+  - pip install tox tox-travis
 
 script:
-    - tox -e $TOXENV
\ No newline at end of file
+  - tox -r
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6efdec2..ed4acba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## master (unreleased)
 
-Nothing to see here yet.
+- Confirm support for Django 2.2
 
 ## 1.4.0 (2018-12-17)
 
diff --git a/README.rst b/README.rst
index bfa399d..a160504 100644
--- a/README.rst
+++ b/README.rst
@@ -11,7 +11,7 @@ your RAM.
 Tested with all the combinations of:
 
 * Python: 2.7, 3.5, 3.6, 3.7
-* Django: 1.11, 2, 2.1, master
+* Django: 1.11, 2, 2.1, 2.2, master
 
 
 Usage
diff --git a/tox.ini b/tox.ini
index ae3d008..62dfa82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,9 @@
 [tox]
 envlist =
-    flake8-py27,
-    flake8-py35,
+    py{27,35}-flake8,
     py{27,35,36}-django111,
-    py{35,36,37}-django20,
-    py{35,36,37}-django21,
-    py{35,36,37}-djangomaster
+    py{35,36,37}-django{20,21,22}
+    py{36,37}-djangomaster
 
 [testenv]
 basepython =
@@ -18,16 +16,24 @@ deps =
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<3.0
     djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 commands =
     python --version
     pip install -e demo/
     rundemo test demo_chunkator
 
-[testenv:flake8-py27]
+[travis]
+python =
+  2.7: py27
+  3.5: py35
+  3.6: py36
+  3.7: py37
+
+[testenv:py27-flake8]
 commands = flake8 chunkator
 deps = flake8
 
-[testenv:flake8-py35]
+[testenv:py35-flake8]
 commands = flake8 chunkator
 deps = flake8

From 8b563293b1312b567b39fc642c7ac10d980ea12d Mon Sep 17 00:00:00 2001
From: Fabre Florian <ffabre@hybird.org>
Date: Thu, 18 Apr 2019 07:43:25 +0200
Subject: [PATCH 2/2] Allow failures on *-djangomaster tox targets

---
 tox.ini | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 62dfa82..779bed4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ deps =
 commands =
     python --version
     pip install -e demo/
-    rundemo test demo_chunkator
+    python -Wd {envbindir}/rundemo test {posargs:demo_chunkator}
 
 [travis]
 python =
@@ -30,6 +30,12 @@ python =
   3.6: py36
   3.7: py37
 
+[testenv:py36-djangomaster]
+ignore_outcome=true
+
+[testenv:py37-djangomaster]
+ignore_outcome=true
+
 [testenv:py27-flake8]
 commands = flake8 chunkator
 deps = flake8