summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Baker <andy@andybak.net>2015-07-04 09:51:33 (GMT)
committerAndy Baker <andy@andybak.net>2015-07-04 09:51:33 (GMT)
commiteaa32275998226a1499cac2f6ce02c3541d567aa (patch)
tree1548a0451213e4b2ac31859e877e5dd26beb2edd
parent08ae04cd2f45d498f6eb9099b1214e195f9a13ea (diff)
downloaddjango-admin-tools-eaa32275998226a1499cac2f6ce02c3541d567aa.zip
django-admin-tools-eaa32275998226a1499cac2f6ce02c3541d567aa.tar.gz
django-admin-tools-eaa32275998226a1499cac2f6ce02c3541d567aa.tar.bz2
Update tox matrix to match agreed support
See #1 for the discussion
-rw-r--r--tox.ini40
1 files changed, 13 insertions, 27 deletions
diff --git a/tox.ini b/tox.ini
index 3e7a1ab..4615384 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,43 +1,29 @@
[tox]
-envlist = py26-dj13, py27-dj14, py27-dj15, py27-dj16, py33-dj16
+envlist = py27-dj17, py27-dj18, py33-dj17, py33-dj18
-[testenv:py26-dj13]
-basepython = python2.6
-deps =
- south
- django==1.3.5
-
-[testenv:py27-dj14]
-basepython = python2.7
-deps =
- south
- django==1.4.3
-
-[testenv:py27-dj15]
-basepython = python2.7
-deps =
- south
- django==1.5
-
-[testenv:py27-dj16]
+[testenv:py27-dj17]
basepython = python2.7
deps =
south
- django==1.6
+ django==1.7.8
[testenv:py27-dj17]
basepython = python2.7
deps =
south
- django==1.7rc2
+ django==1.8.2
+
+[testenv:py33-dj17]
+basepython = python3.3
+deps =
+ south
+ django==1.7.8
-;south 1.0 is not python3 compatible, 0.8.4 was:
-;http://stackoverflow.com/questions/24529618/why-does-django-south-1-0-use-iteritems
-[testenv:py33-dj16]
+[testenv:py33-dj17]
basepython = python3.3
deps =
- south==0.8.4
- django==1.6
+ south
+ django==1.8.2
[testenv]
commands =