Stop using setup.py for running the tests.

This commit is contained in:
Jannis Leidel 2014-11-21 14:48:52 +01:00
parent 4278f64ae1
commit 9c975cbe58
3 changed files with 6 additions and 18 deletions

View file

@ -44,8 +44,6 @@ setup(
],
packages=find_packages(exclude=['tests']),
include_package_data=True,
test_suite='tests.runtests.main',
tests_require=['django-discover-runner', 'django-picklefield', 'redis'],
install_requires=['six'],
zip_safe=False,
extras_require={

View file

@ -1,15 +0,0 @@
#!/usr/bin/env python
import os
import sys
from django.core.management import call_command
os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
def main():
result = call_command('test', 'tests', verbosity=2)
sys.exit(result)
if __name__ == '__main__':
main()

View file

@ -10,7 +10,11 @@ basepython =
py34: python3.4
pypy: pypy
deps =
redis
coverage
django-picklefield
py26: unittest2
django-{14,15}: django-discover-runner
django-14: Django>=1.4,<1.5
django-15: Django>=1.5,<1.6
django-16: Django>=1.6,<1.7
@ -18,4 +22,5 @@ deps =
django-master: https://github.com/django/django/archive/master.zip
usedevelop = true
commands =
python setup.py test
coverage run `which django-admin.py` test --settings=tests.settings -v2
coverage report