Merge branch 'master' of https://github.com/ryanbagwell/django-cas-provider into...

[django-cas-provider.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 2a4c5fb..4344927 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,31 +1,28 @@
 [tox]
 envlist=clear,
 [tox]
 envlist=clear,

-    d1{5,6}-py{26,27,32,33},
-    d{17,18,d}-py{27,32,33,34},
+    d18-py{27,34},
+    d{19,110}-py{27,34,35},
+    d111-py{27,34,35,36,37},
+    d20-py{34,35,36,37},
+    d21-py{35,36,37},

     stats
 
 [testenv]
 commands=coverage run --source=cas_provider --append --branch cas_provider_examples/manage.py test simple
 deps=
     stats
 
 [testenv]
 commands=coverage run --source=cas_provider --append --branch cas_provider_examples/manage.py test simple
 deps=

-    d15: Django>=1.5,<1.6
-    d16: Django>=1.6,<1.7
-    d17: Django>=1.7,<1.8
-    d18: https://www.djangoproject.com/download/1.8b2/tarball/
-    dd: https://github.com/django/django/zipball/master
+    d18: Django>=1.8,<1.9
+    d19: Django>=1.9,<1.10
+    d110: Django>=1.10,<1.11
+    d111: Django>=1.11,<2.0
+    d20: Django>=2.0,<2.1
+    d21: Django>=2.1,<2.2

     d15,d16: https://bitbucket.org/andrewgodwin/south/get/e2c9102ee033.zip
     coverage
     d15,d16: https://bitbucket.org/andrewgodwin/south/get/e2c9102ee033.zip
     coverage

-basepython=
-    py26: python2.6
-    py27: python2.7
-    py32: python3.2
-    py33: python3.3
-    py34: python3.4
+usedevelop=True

 
 [testenv:clear]
 
 [testenv:clear]

-basepython=python3.4

 commands=coverage erase
 
 [testenv:stats]
 commands=coverage erase
 
 [testenv:stats]

-basepython=python3.4

 commands=coverage html
 
 commands=coverage html