diff --git a/.travis.yml b/.travis.yml index 603b8ae..69dfce6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,8 @@ install: before_script: - flake8 dbtemplates --ignore=E501 script: - - django-admin.py test dbtemplates + - coverage run --branch --source=dbtemplates `which django-admin.py` test dbtemplates + - coverage report --omit="dbtemplates/test*,dbtemplates/migrations*" env: - DJANGO=1.3.1 - DJANGO=1.4 diff --git a/dbtemplates/test_settings.py b/dbtemplates/test_settings.py index 6ce4617..a948cba 100644 --- a/dbtemplates/test_settings.py +++ b/dbtemplates/test_settings.py @@ -21,7 +21,6 @@ INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', 'dbtemplates', - 'django_nose', ] TEMPLATE_LOADERS = ( @@ -30,4 +29,4 @@ TEMPLATE_LOADERS = ( 'dbtemplates.loader.Loader', ) -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' +TEST_RUNNER = 'discover_runner.DiscoverRunner' diff --git a/docs/changelog.txt b/docs/changelog.txt index b324766..43a9f28 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -1,6 +1,14 @@ Changelog ========= +v1.3.1 (2012-05-23) +------------------- + +* Minor release to move away from nose again and use own + `django-discover-runner`_. + +.. _`django-discover-runner`: http://pypi.python.org/pypi/django-discover-runner + v1.3 (2012-05-07) ----------------- diff --git a/requirements/tests.txt b/requirements/tests.txt index 68eba17..b29024e 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,3 +1,3 @@ flake8 -django-nose +django-discover-runner coverage diff --git a/setup.cfg b/setup.cfg index 78ce9b8..cf6fb59 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,7 +11,3 @@ upload-dir = docs/_build/html [upload_sphinx] upload-dir = docs/_build/html - -[nosetests] -with-coverage=1 -cover-package=dbtemplates