From d15e31b28d8a98c5df969fa8ebaa01b05897f2f5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Oct 2012 13:05:01 +0100 Subject: [PATCH 1/3] Drop coverage in travis tests --- .travis.yml | 1 - setup.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfb084961..3c8bb4723 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ install: - pip install $DJANGO - pip install -e . --use-mirrors - pip install -r requirements.txt --use-mirrors - - pip install coverage==3.5.1 --use-mirrors script: - python setup.py test diff --git a/setup.py b/setup.py index 19cf6d4c7..8ac2f03f5 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', From 3c9fb0429973282e59e0ae8d4d0fb38ac56f495f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Oct 2012 13:09:53 +0100 Subject: [PATCH 2/3] Don't bother to setup.py test, just test directly --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c8bb4723..2439bd787 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ env: install: - pip install $DJANGO - - pip install -e . --use-mirrors - - pip install -r requirements.txt --use-mirrors script: - - python setup.py test + - python rest_framework/runtests/runtests.py From db0a9acfd7aca21f4ec65c84e74db5034660e2ff Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Oct 2012 13:12:43 +0100 Subject: [PATCH 3/3] Add PYTHONPATH in travis config --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2439bd787..0e177a95a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ env: - DJANGO=django==1.3.3 --use-mirrors install: - - pip install $DJANGO + - pip install $DJANGO + - export PYTHONPATH=. script: - python rest_framework/runtests/runtests.py