diff --git a/.travis.yml b/.travis.yml index c785f827bf..ac4650a60c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,15 @@ matrix: - env: TOXENV=py27-dj110-mysql-elasticsearch5 INSTALL_ELASTICSEARCH5=yes python: 2.7 sudo: true + - env: TOXENV=py27-dj111-sqlite-noelasticsearch + python: 2.7 + - env: TOXENV=py27-dj111-postgres-noelasticsearch + python: 2.7 + - env: TOXENV=py27-dj111-mysql-noelasticsearch + python: 2.7 + - env: TOXENV=py27-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes + python: 2.7 + sudo: true - env: TOXENV=py34-dj110-postgres-noelasticsearch python: 3.4 - env: TOXENV=py34-dj110-sqlite-noelasticsearch @@ -52,11 +61,35 @@ matrix: sudo: true - env: TOXENV=py35-dj110head-postgres-noelasticsearch python: 3.5 + - env: TOXENV=py35-dj111-sqlite-noelasticsearch + python: 3.5 + - env: TOXENV=py35-dj111-postgres-noelasticsearch + python: 3.5 + - env: TOXENV=py35-dj111-mysql-noelasticsearch + python: 3.5 + - env: TOXENV=py35-dj111-postgres-elasticsearch + python: 3.5 + - env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes + python: 3.5 + sudo: true + - env: TOXENV=py35-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes + python: 3.5 + sudo: true allow_failures: + - env: TOXENV=py27-dj110-mysql-elasticsearch5 INSTALL_ELASTICSEARCH5=yes + - env: TOXENV=py27-dj111-sqlite-noelasticsearch + - env: TOXENV=py27-dj111-postgres-noelasticsearch + - env: TOXENV=py27-dj111-mysql-noelasticsearch + - env: TOXENV=py27-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes - env: TOXENV=py35-dj110-postgres-elasticsearch - env: TOXENV=py35-dj110-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes - - env: TOXENV=py27-dj110-mysql-elasticsearch5 INSTALL_ELASTICSEARCH5=yes - env: TOXENV=py35-dj110-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes + - env: TOXENV=py35-dj111-sqlite-noelasticsearch + - env: TOXENV=py35-dj111-postgres-noelasticsearch + - env: TOXENV=py35-dj111-mysql-noelasticsearch + - env: TOXENV=py35-dj111-postgres-elasticsearch + - env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes + - env: TOXENV=py35-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes # Services services: diff --git a/tox.ini b/tox.ini index 893657d9a2..ac657ec392 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,7 @@ skipsdist = True usedevelop = True -envlist = py{27,34,35}-dj18-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch}, - py{27,34,35}-dj{110,110head}-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch}, +envlist = py{27,34,35}-dj{18,110,110head,dj11}-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch}, flake8 [testenv] @@ -26,6 +25,7 @@ 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 + dj11: Django>=1.11b1,<1.12 postgres: psycopg2>=2.6 mysql: mysqlclient==1.3.6 elasticsearch: elasticsearch>=1,<2