diff --git a/.travis.yml b/.travis.yml index a59202a2d7..e0d8de7f38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,8 +59,6 @@ matrix: - env: TOXENV=py35-dj110-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes python: 3.5 sudo: true - - env: TOXENV=py35-dj110head-postgres-noelasticsearch - python: 3.5 - env: TOXENV=py35-dj111-postgres-noelasticsearch python: 3.5 - env: TOXENV=py35-dj111-postgres-elasticsearch diff --git a/tox.ini b/tox.ini index f9ed894f82..4dfd1dd5f4 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ skipsdist = True usedevelop = True -envlist = py{27,34,35}-dj{18,110,110head}-{sqlite,postgres,mysql,mssql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch}, +envlist = py{27,34,35}-dj{18,110}-{sqlite,postgres,mysql,mssql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch}, py{27,34,35,36}-dj111-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch}, flake8 @@ -45,7 +45,6 @@ deps = dj18: Django>=1.8.1,<1.9 dj110: Django>=1.10a1,<1.11 - dj110head: git+https://github.com/django/django.git@stable/1.10.x#egg=Django dj111: Django>=1.11b1,<2.0 dj18-mssql: django-pyodbc-azure==1.8.13.0 dj19-mssql: django-pyodbc-azure==1.9.6.0