From ffcc25f16e75a489973731e3d1996a3e8ce748f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Mali=C5=84ski?= <riklaunim@gmail.com>
Date: Tue, 7 Jul 2015 19:53:31 +0200
Subject: [PATCH] Run tox tests against Django 1.8/1.7 and Python 3.4/2.7.

---
 tox.ini | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 6e25739..fb37e8f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,38 @@
 [tox]
-envlist=py27,py34
+envlist=django1.8-py3.4,django1.8-py2.7,django1.7-py2.7,django1.7-py3.4
 
 [testenv]
 commands=bash -exc "python manage.py test ckeditor_demo"
 whitelist_externals=/bin/bash
 setenv=DJANGO_SETTINGS_MODULE=ckeditor_demo.settings
 deps=
-    Django==1.7.1
-    Pillow==2.5.3
-    selenium==2.42.1
+    Pillow==2.9.0
+    selenium==2.46.0
+
+
+[testenv:django1.8-py3.4]
+basepython = python3.4
+deps =
+    Django==1.8.2
+    {[testenv]deps}
+
+
+[testenv:django1.8-py2.7]
+basepython = python2.7
+deps =
+    Django==1.8.2
+    {[testenv]deps}
+
+
+[testenv:django1.7-py2.7]
+basepython = python2.7
+deps =
+    Django==1.7.8
+    {[testenv]deps}
+
+
+[testenv:django1.7-py3.4]
+basepython = python3.4
+deps =
+    Django==1.7.8
+    {[testenv]deps}