From f4c886ab6ca1944e3c5993297fa4212c4ba28901 Mon Sep 17 00:00:00 2001
From: tzangms <tzangms@gmail.com>
Date: Mon, 1 Aug 2016 18:06:58 +0800
Subject: [PATCH 1/2] Add tox unit test

---
 .travis.yml | 20 +++++++++++++++-----
 tox.ini     | 23 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
index 26e678e..c55fb43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,26 @@
 language: python
 
+env:
+  matrix:
+    - TOX_ENV=py27-dj15
+    - TOX_ENV=py27-dj16
+    - TOX_ENV=py27-dj17
+    - TOX_ENV=py27-dj18
+    - TOX_ENV=py34-dj15
+    - TOX_ENV=py34-dj16
+    - TOX_ENV=py34-dj17
+    - TOX_ENV=py34-dj18
+
 python:
   - "2.7"
-
-before_install:
-  - sudo apt-get update -qq
+  - "3.4"
 
 install:
-  - pip install coveralls
+  - pip install tox coverage coveralls
 
 script:
-  - coverage run --source=djcelery_ses setup.py test
+  #- coverage run --source=djcelery_ses setup.py test
+  - tox -e $TOX_ENV
 
 after_success:
   - coveralls
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..52bff21
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,23 @@
+[tox]
+envlist = {py27,py34}-dj{15,16,17,18,19}
+skipsdist=True
+
+
+[testenv]
+basepython =
+    py27: python2.7
+    py34: python3.4
+deps = 
+    pytest
+    dj15: django>=1.5,<1.6
+    dj16: django>=1.6,<1.7
+    dj17: django>=1.7,<1.8
+    dj18: django>=1.8,<1.9
+    dj19: django>=1.9,<1.10
+commands = python setup.py test
+
+
+[testenv:py27-cov]
+deps =
+    dj18: Django>=1.8,<1.9
+command = coverage run --source=bootstrapform setup.py test

From 9cd8133078e5adcdf9861d37de9ea8ac8f8793c5 Mon Sep 17 00:00:00 2001
From: tzangms <tzangms@gmail.com>
Date: Mon, 1 Aug 2016 18:15:12 +0800
Subject: [PATCH 2/2] fix

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 52bff21..11f8a14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,4 +20,4 @@ commands = python setup.py test
 [testenv:py27-cov]
 deps =
     dj18: Django>=1.8,<1.9
-command = coverage run --source=bootstrapform setup.py test
+command = coverage run --source=djcelery_ses setup.py test