diff options
| author | Xavier Ordoquy | 2015-04-02 11:17:16 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2015-04-02 11:17:16 +0200 |
| commit | 73e46d9a7fa5c3adba5236cfac79649723ebc60f (patch) | |
| tree | 46b44916fe3e96bce274145cc1549c53f038b947 | |
| parent | 5cf8230ba1f1970a53394356d48a35315e132638 (diff) | |
| parent | 596093d4941a14ea7443811450c9262c87bcdbd4 (diff) | |
| download | django-rest-framework-73e46d9a7fa5c3adba5236cfac79649723ebc60f.tar.bz2 | |
Merge pull request #2786 from maryokhin/patch-2
Update tox & Travis with Django 1.8 release
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 3eb89dc4..71cec7be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,10 @@ sudo: false env: - TOX_ENV=py27-flake8 - TOX_ENV=py27-docs + - TOX_ENV=py34-django18 + - TOX_ENV=py33-django18 + - TOX_ENV=py32-django18 + - TOX_ENV=py27-django18 - TOX_ENV=py34-django17 - TOX_ENV=py33-django17 - TOX_ENV=py32-django17 @@ -21,10 +25,7 @@ env: - TOX_ENV=py26-django15 - TOX_ENV=py27-django14 - TOX_ENV=py26-django14 - - TOX_ENV=py34-django18beta - - TOX_ENV=py33-django18beta - - TOX_ENV=py32-django18beta - - TOX_ENV=py27-django18beta + install: - pip install tox @@ -3,7 +3,7 @@ envlist = py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,18beta} + {py27,py32,py33,py34}-django{17,18} [testenv] commands = ./runtests.py --fast @@ -14,7 +14,7 @@ deps = django15: Django==1.5.6 # Should track minimum supported django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported - django18beta: https://www.djangoproject.com/download/1.8b1/tarball/ + django18: Django==1.8 # Should track maximum supported -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt |