diff options
| author | Tom Christie | 2013-06-02 13:11:49 -0700 |
|---|---|---|
| committer | Tom Christie | 2013-06-02 13:11:49 -0700 |
| commit | 1bb5fb8e4a88375f7f51d20175515bfa6e926f3c (patch) | |
| tree | 62c574fbbb208c0606ed24d792931681f3b13806 | |
| parent | a3796f430b96abe71f2f99f566d9f7655e89f268 (diff) | |
| parent | 9d4fc3226e5e730ac29528a7e84bcdbb7d2e1f44 (diff) | |
| download | django-rest-framework-1bb5fb8e4a88375f7f51d20175515bfa6e926f3c.tar.bz2 | |
Merge pull request #895 from linovia/django1.6a1
Added Django 1.6a1 to the test matrix.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | rest_framework/runtests/runtests.py | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 3a7c2d7a..6a453241 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: - "3.3" env: + - DJANGO="https://www.djangoproject.com/download/1.6a1/tarball/" - DJANGO="django==1.5.1 --use-mirrors" - DJANGO="django==1.4.5 --use-mirrors" - DJANGO="django==1.3.7 --use-mirrors" @@ -16,7 +17,7 @@ install: - pip install defusedxml==0.3 - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.3 --use-mirrors; fi" + - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4 --use-mirrors; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi" - export PYTHONPATH=. diff --git a/rest_framework/runtests/runtests.py b/rest_framework/runtests/runtests.py index 4a333fb3..da36d23f 100755 --- a/rest_framework/runtests/runtests.py +++ b/rest_framework/runtests/runtests.py @@ -10,6 +10,7 @@ import sys sys.path.append(os.path.join(os.path.dirname(__file__), "../..")) os.environ['DJANGO_SETTINGS_MODULE'] = 'rest_framework.runtests.settings' +import django from django.conf import settings from django.test.utils import get_runner @@ -35,7 +36,11 @@ def main(): else: print(usage()) sys.exit(1) - failures = test_runner.run_tests(['tests' + test_case]) + test_module_name = 'rest_framework.tests' + if django.VERSION[0] == 1 and django.VERSION[1] < 6: + test_module_name = 'tests' + + failures = test_runner.run_tests([test_module_name + test_case]) sys.exit(failures) |