diff options
| author | Ashley Camba Garrido <ashwoods@gmail.com> | 2017-08-09 17:09:49 +0200 |
|---|---|---|
| committer | Ashley Camba Garrido <ashwoods@gmail.com> | 2017-08-09 17:12:00 +0200 |
| commit | ad3379ac845b9b9c21a425e184daf7ecd517ddf8 (patch) | |
| tree | c780a86de46f5ee396299eaf1498b06c2cb54dd0 | |
| parent | 45941bf4ed414fc84a1ef550c7052c0df29b4ca8 (diff) | |
| download | raven-ad3379ac845b9b9c21a425e184daf7ecd517ddf8.tar.gz | |
Update tox-travis with newer django versions
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | tox.ini | 16 |
2 files changed, 24 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index eeb546f..e317400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,11 @@ cache: jobs: + fast_finish: true +# allow_failures: +# - python: 3.5 +# env: TOXENV=py35-django-dev-fix + include: - stage: core python: 2.7 @@ -47,6 +52,7 @@ jobs: python: 2.7 env: TOXENV=py27-django-110 + - stage: contrib python: 3.3 env: TOXENV=py33-django-17 @@ -76,6 +82,12 @@ jobs: - stage: contrib python: 3.5 env: TOXENV=py35-django-110 + - stage: contrib + python: 3.5 + env: TOXENV=py35-django-111-fix +# - stage: contrib +# python: 3.5 +# env: TOXENV=py35-django-dev-fix - stage: contrib python: 2.7 @@ -5,16 +5,22 @@ [tox] envlist = + # core + py{27,33,34,35} + pypy + flake8 + # contrib + {py35,py36}-django-dev-fix + {py27,py35}-django-111-fix {py27,py34,py35}-django-{18,19,110} {py27,py33,py34,py35}-django-18 {py27,py33,py34}-django-17 py27-django-16 + py35-django-dev {py27,py35}-flask-{10,11} py35-flask-12 py27-celery-{3,4} - py{27,33,34,35} - pypy - flake8 + [testenv] deps = @@ -27,12 +33,14 @@ deps = django-18: Django>=1.8,<1.9 django-19: Django>=1.9,<1.10 django-110: Django>=1.10,<1.11 - # django-111: Django>=1.11,<1.12 TODO: update pytest_django + django-111: Django>=1.11,<1.12 + django-dev: git+https://github.com/django/django.git#egg=Django flask-10: Flask>=0.10,<0.11 flask-11: Flask>=0.11,<0.12 flask-12: Flask>=0.12,<0.13 celery-3: Celery>=3.1,<3.2 celery-4: Celery>=4.0,<4.1 + fix: git+https://github.com/pytest-dev/pytest-django.git#egg=pytest_django setenv = PYTHONDONTWRITEBYTECODE=1 TESTPATH=tests |