Added django-master to test in tox

watchdogpolska · Aug 21, 2015 · e052fde · e052fde
1 parent 1c9a2ae
commit e052fde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,10 @@ env:
     - DATABASE_URL="mysql://root:@localhost/test_feder"
     - DJANGO_SETTINGS_MODULE="config.settings.tests"
   matrix:
-    - TOX_ENV=py27
-    - TOX_ENV=py33
+    - TOX_ENV=py27-dj18
+    - TOX_ENV=py27-djmaster
+    - TOX_ENV=py33-dj18
+    - TOX_ENV=py33-djmaster
     - TOX_ENV=coverage
 
 

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 
 [tox]
 skipsdist = True
-envlist = {py27,py33}, coverage
+envlist = {py27,py33}-{dj18,djmaster}, coverage
 
 [testenv]
 commands = {envpython} manage.py test --verbosity=2
@@ -10,7 +10,8 @@ setenv =
     DJANGO_SETTINGS_MODULE=config.settings.tests
 deps =
     -rrequirements/test.txt
-
+    dj18: Django>=1.8,<1.9
+    djmaster: https://github.com/django/django/zipball/master
 [testenv:py27]
 basepython = python2.7