summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Jean Louis <izimobil@gmail.com>2014-08-11 15:37:22 (GMT)
committerDavid Jean Louis <izimobil@gmail.com>2014-08-11 15:37:22 (GMT)
commit73f60c6e619dd3cdf3eb33443cd79f6e7e020c46 (patch)
treed0b5078bb1d34353e8475ab07a6ed0ff2daaa29b
parentfab0706ba4429e282fbb39796cfe8dadafb0778f (diff)
downloaddjango-admin-tools-73f60c6e619dd3cdf3eb33443cd79f6e7e020c46.zip
django-admin-tools-73f60c6e619dd3cdf3eb33443cd79f6e7e020c46.tar.gz
django-admin-tools-73f60c6e619dd3cdf3eb33443cd79f6e7e020c46.tar.bz2
Fixed south dependency, we stick to 0.8.4 for python 3 because south 1.0 is not fully compatible
-rw-r--r--tox.ini10
1 files changed, 9 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 2373002..3e7a1ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,10 +25,18 @@ deps =
south
django==1.6
+[testenv:py27-dj17]
+basepython = python2.7
+deps =
+ south
+ django==1.7rc2
+
+;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]
basepython = python3.3
deps =
- south
+ south==0.8.4
django==1.6
[testenv]