diff --git a/setup.py b/setup.py index 2f30679..c54c041 100644 --- a/setup.py +++ b/setup.py @@ -44,9 +44,9 @@ setup( include_package_data=True, tests_require=[ 'beautifulsoup4==4.1.3', - 'nose==1.2.1', - 'nose-progressive==1.3', - 'django-nose==1.1', + 'nose==1.3.0', + 'nose-progressive==1.5', + 'django-nose==1.2', 'Pillow<3.0', ], test_suite='testrunner.run_tests', diff --git a/tox.ini b/tox.ini index 46ca387..1dc2b41 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,23 @@ [tox] envlist = + py33-django15, + py32-django15, py27-django15, py27-django14, py27-django13, py27-django12, py26-django15, py26-django14, py26-django13, py26-django12 [testenv] commands = python setup.py test +[testenv:py33-django15] +basepython = python3.3 +deps = + Django>=1.5,<1.6 + +[testenv:py32-django15] +basepython = python3.2 +deps = + Django>=1.5,<1.6 + [testenv:py27-django15] basepython = python2.7 deps =