diff --git a/dev-requirements.txt b/dev-requirements.txt index 56cf461..e3d882a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,4 @@ tox mock -django-nose coverage==3.7.1 vcrpy diff --git a/testing/test_settings.py b/testing/test_settings.py index 5cc5f93..155f454 100755 --- a/testing/test_settings.py +++ b/testing/test_settings.py @@ -149,13 +149,6 @@ return email.rsplit('@', 1)[0] BROWSERID_USERNAME_ALGO = username -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' -NOSE_ARGS = [ - '--with-coverage', - '--cover-package=postorius', - '--cover-erase', - '--cover-html', -] # Set VCR_RECORD_MODE to 'all' to re-record all API responses. # (Remember to use an empty mailman database!) diff --git a/tox.ini b/tox.ini index cf34015..bb2acfd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,37 +1,23 @@ [tox] -envlist = py27-django{1.5,1.6,1.7} +envlist = py27-django{16,17,18} [testenv] usedevelop = True +deps = + -rdev-requirements.txt + django16: Django>=1.6,<1.7 + django17: Django>=1.6,<1.8 + django18: Django==1.8 commands = django-admin.py test --settings=testing.test_settings {posargs:postorius} setenv = PYTHONPATH = {toxinidir} -[base] -deps = - -rdev-requirements.txt - -[testenv:py27-django1.5] -deps = - {[base]deps} - Django<1.6 - -[testenv:py27-django1.6] -deps = - {[base]deps} - Django<1.7 - -[testenv:py27-django1.7] -deps = - {[base]deps} - Django==1.7 - [testenv:record] basepython = python2.7 deps = - {[base]deps} - Django==1.7 + -rdev-requirements.txt + Django==1.8 setenv = PYTHONPATH = {toxinidir} POSTORIUS_VCR_RECORD_MODE = all