diff --git a/.travis.yml b/.travis.yml index 753b26b0..16dab258 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,31 +2,27 @@ language: python python: - "2.7" env: - - TOX_ENV=pypy-dj1.7-sqlite - - TOX_ENV=py34-dj1.7-sqlite - - TOX_ENV=py33-dj1.7-sqlite - - TOX_ENV=py32-dj1.7-sqlite - - TOX_ENV=py27-dj1.7-sqlite + - TOX_ENV=pypy-dj1.9-sqlite + - TOX_ENV=py35-dj1.9-sqlite + - TOX_ENV=py27-dj1.9-sqlite + - TOX_ENV=pypy-dj1.9-mysql + - TOX_ENV=py35-dj1.9-mysql + - TOX_ENV=py27-dj1.9-mysql + - TOX_ENV=pypy-dj1.9-postgres + - TOX_ENV=py35-dj1.9-postgres + - TOX_ENV=py27-dj1.9-postgres + - TOX_ENV=pypy3-dj1.8-sqlite - TOX_ENV=pypy-dj1.8-sqlite - - TOX_ENV=py34-dj1.8-sqlite - - TOX_ENV=py33-dj1.8-sqlite - - TOX_ENV=py32-dj1.8-sqlite + - TOX_ENV=py35-dj1.8-sqlite - TOX_ENV=py27-dj1.8-sqlite - - TOX_ENV=pypy3-dj1.8-mysql - - TOX_ENV=pypy-dj1.8-mysql - - TOX_ENV=py34-dj1.8-mysql - - TOX_ENV=py27-dj1.8-mysql - - TOX_ENV=pypy-dj1.8-postgres - - TOX_ENV=py34-dj1.8-postgres - - TOX_ENV=py27-dj1.8-postgres + - TOX_ENV=pypy-dj1.7-sqlite + - TOX_ENV=py34-dj1.7-sqlite + - TOX_ENV=py27-dj1.7-sqlite - TOX_ENV=pypy-dj1.6-sqlite - TOX_ENV=py33-dj1.6-sqlite - - TOX_ENV=py32-dj1.6-sqlite - - TOX_ENV=py27-dj1.6-sqlite - TOX_ENV=py26-dj1.6-sqlite - TOX_ENV=pypy-dj1.5-sqlite - TOX_ENV=py33-dj1.5-sqlite - - TOX_ENV=py32-dj1.5-sqlite - TOX_ENV=py27-dj1.5-sqlite - TOX_ENV=py26-dj1.5-sqlite - TOX_ENV=pypy-dj1.4-sqlite @@ -34,7 +30,7 @@ env: - TOX_ENV=py26-dj1.4-sqlite - TOX_ENV=coverage install: - - pip install tox==1.8.1 coveralls==0.5 + - pip install tox==2.3.1 coveralls==1.1 addons: postgresql: "9.3" script: diff --git a/tox.ini b/tox.ini index 1753ee66..9ac7cf0c 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ deps = py{26,27,32,33,34,35}-dj{1.4,1.5,1.6,1.7,1.8,1.9}-postgres: psycopg2==2.6 py{py,py3}-dj{1.4,1.5,1.6,1.7,1.8,1.9}-postgres: psycopg2cffi==2.6.1 py{py,26,27}-dj{1.4,1.5,1.6,1.7,1.8,1.9}-mysql: MySQL-python==1.2.5 - py{py3,32,33,34}-dj{1.4,1.5,1.6,1.7,1.8,1.9}-mysql: PyMySQL==0.6.6 + py{py3,32,33,34,35}-dj{1.4,1.5,1.6,1.7,1.8,1.9}-mysql: PyMySQL==0.6.6 setenv = mysql: DATABASE_ENGINE=mysql @@ -26,11 +26,11 @@ setenv = [testenv:coverage] basepython = python2.7 deps = - django-jsonfield==0.9.13 + django-jsonfield==0.9.15 Django>=1.6,<1.7 South==1.0.2 - coveralls==0.5 - coverage==3.7.1 + coveralls==1.1 + coverage==4.0.3 -egit+https://github.com/justquick/django-coverage.git#egg=django_coverage setenv = COVERAGE=True