Merge pull request #193 from felixxm/issue-bumped-django

Fixed travis configuration. Bumped Django versions.
This commit is contained in:
Camilo Nova 2017-01-28 16:26:56 -05:00 committed by GitHub
commit e16657567f
2 changed files with 13 additions and 2 deletions

View file

@ -10,15 +10,24 @@ env:
- TOXENV=py27-django-18
- TOXENV=py27-django-19
- TOXENV=py27-django-110
- TOXENV=py27-django-master
- TOXENV=py27-django-111
- TOXENV=py35-django-18
- TOXENV=py35-django-19
- TOXENV=py35-django-110
- TOXENV=py35-django-111
- TOXENV=py35-django-master
- TOXENV=pypy-django-18
- TOXENV=pypy-django-19
- TOXENV=pypy-django-110
- TOXENV=pypy-django-111
- TOXENV=pypy-django-master
matrix:
allow_failures:
- env: TOXENV=py27-django-111
- env: TOXENV=py35-django-111
- env: TOXENV=pypy-django-111
- env: TOXENV=py35-django-master
- env: TOXENV=pypy-django-master
script:
- tox
deploy:

View file

@ -1,6 +1,7 @@
[tox]
envlist =
{py27,py35,pypy}-django-{18,19,110,master}
{py27,py35,pypy}-django-{18,19,110,111}
{py35,pypy}-django-master
[testenv]
basepython =
@ -14,6 +15,7 @@ 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.11a1,<2.0
django-master: https://github.com/django/django/archive/master.tar.gz
usedevelop = true
commands =