From 5661c06a28ceeaa78108396f32d0eab7069dfd97 Mon Sep 17 00:00:00 2001
From: Kelvin Jayanoris <kjayanoris@gmail.com>
Date: Sat, 29 Dec 2018 20:03:52 +0300
Subject: [PATCH 1/4] Add python3.7 info

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 64d310a..d33f4cc 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@
     ],
     classifiers=[
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6'
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7'
     ],
 )

From 29834786ff164a028b1fd4f9a6c141a0291ef4c9 Mon Sep 17 00:00:00 2001
From: Kelvin Jayanoris <kjayanoris@gmail.com>
Date: Sat, 29 Dec 2018 20:04:45 +0300
Subject: [PATCH 2/4] Add tox config for python3.6, python3.7, django2.0,
 django2.1 testing

---
 tox.ini | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 2e2f9ec..10ec7a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,8 @@
 envlist =
     flake8
     pylint
-    py36
+    py36-django{20,21}
+    py37-django{20,21}
 
 [testenv:flake8]
 deps =
@@ -20,12 +21,16 @@ commands =
     pip install -r requirements/dev.txt
     pylint --rcfile={toxinidir}/.pylintrc {toxinidir}/vega_admin
 
-[testenv:py36]
+[testenv]
 deps =
     coverage
-basepython = python3.6
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+basepython =
+    py36: python3.6
+    py37: python3.7
 commands =
-    pip install -r requirements/dev.txt
+    pip install -r requirements/dev.in
     coverage erase
     coverage run --include="vega_admin/**.*" --omit="tests/**.*,vega_admin/migrations/**.*" manage.py test {toxinidir}/tests
     coverage report

From d8090721a1e49ebfdc878d5e766084b722398f7b Mon Sep 17 00:00:00 2001
From: Kelvin Jayanoris <kjayanoris@gmail.com>
Date: Sat, 29 Dec 2018 20:05:07 +0300
Subject: [PATCH 3/4] Travis tests for all tox envs

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index acc606d..2650c34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,13 @@ matrix:
         - python: 3.6
           env: TOXENV=pylint
         - python: 3.6
-          env: TOXENV=py36
+          env: TOXENV=py36-django20
+        - python: 3.6
+          env: TOXENV=py36-django21
+        - python: 3.7
+          env: TOXENV=py37-django20
+        - python: 3.7
+          env: TOXENV=py37-django21
 services:
     - postgresql
 addons:

From 17555fb2d8fcb3e61f284c50c55601e24287753e Mon Sep 17 00:00:00 2001
From: Kelvin Jayanoris <kjayanoris@gmail.com>
Date: Sat, 29 Dec 2018 20:14:56 +0300
Subject: [PATCH 4/4] Use `dist: xenial` for python3.7

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2650c34..d952e56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,10 @@ matrix:
           env: TOXENV=py36-django21
         - python: 3.7
           env: TOXENV=py37-django20
+          dist: xenial
         - python: 3.7
           env: TOXENV=py37-django21
+          dist: xenial
 services:
     - postgresql
 addons: