aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-10-13 05:40:55 -0700
committerTom Christie2012-10-13 05:40:55 -0700
commitee38c03a155d0087ec8b826524ca4ae6e7e08597 (patch)
tree5edd74a54c2fccf3df906d12d3609847fc3f4221
parente48a3a01d94c3ff331a758056eae7692d613c1ee (diff)
parentdb0a9acfd7aca21f4ec65c84e74db5034660e2ff (diff)
downloaddjango-rest-framework-ee38c03a155d0087ec8b826524ca4ae6e7e08597.tar.bz2
Merge pull request #291 from tomchristie/drop-coverage
Drop coverage in travis tests
-rw-r--r--.travis.yml8
-rwxr-xr-xsetup.py2
2 files changed, 4 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index dfb08496..0e177a95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,8 @@ env:
- DJANGO=django==1.3.3 --use-mirrors
install:
- - pip install $DJANGO
- - pip install -e . --use-mirrors
- - pip install -r requirements.txt --use-mirrors
- - pip install coverage==3.5.1 --use-mirrors
+ - pip install $DJANGO
+ - export PYTHONPATH=.
script:
- - python setup.py test
+ - python rest_framework/runtests/runtests.py
diff --git a/setup.py b/setup.py
index 19cf6d4c..8ac2f03f 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ setup(
author_email='tom@tomchristie.com',
packages=get_packages('rest_framework'),
package_data=get_package_data('rest_framework'),
- test_suite='rest_framework.runtests.runcoverage.main',
+ test_suite='rest_framework.runtests.runtests.main',
install_requires=[],
classifiers=[
'Development Status :: 4 - Beta',