Commits

Carl Meyer  committed 6c7c712

Add Django 1.6 branch to tox.

  • Participants
  • Parent commits cf6de85

Comments (0)

Files changed (1)

 [tox]
-envlist=py26-1.4,py26,py26-trunk,py27-1.4,py27,py27-trunk
+envlist=
+  py26-1.4,py26,py26-1.6,
+  py27-1.4,py27,py27-1.6,py27-trunk
 
 [testenv]
 deps=
   django==1.5.1
-  South==0.7.6
+  South==0.8.1
 commands=python setup.py test
 
 [testenv:py26-1.4]
 basepython=python2.6
 deps=
   django==1.4.5
-  South==0.7.6
+  South==0.8.1
 
-[testenv:py26-trunk]
+[testenv:py26-1.6]
 basepython=python2.6
 deps=
-  https://github.com/django/django/tarball/master
-  South==0.7.6
+  https://github.com/django/django/tarball/stable/1.6.x
+  South==0.8.1
 
 [testenv:py27-1.4]
 basepython=python2.7
 deps=
   django==1.4.5
-  South==0.7.6
+  South==0.8.1
+
+[testenv:py27-1.6]
+basepython=python2.7
+deps=
+  https://github.com/django/django/tarball/stable/1.6.x
+  South==0.8.1
 
 [testenv:py27-trunk]
 basepython=python2.7
 deps=
   https://github.com/django/django/tarball/master
-  South==0.7.6
+  South==0.8.1