Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-01 20:14:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Python 3.6 to CI test matrix

Browse source
This commit is contained in:
Matt Westcott 2017-02-28 11:38:57 +00:00 committed by Mikalai Radchuk
parent e34bde2e5d
commit a98e0d9862
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.travis.yml
View file

@ -61,19 +61,23 @@ 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
- env: TOXENV=py36-dj111-sqlite-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj111-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj111-mysql-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj111-postgres-elasticsearch
python: 3.6
- env: TOXENV=py36-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
sudo: true
- env: TOXENV=py35-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.5
- env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.6
sudo: true
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky;
@ -86,12 +90,14 @@ matrix:
- env: TOXENV=py35-dj110-postgres-elasticsearch
- env: TOXENV=py35-dj110-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=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
- env: TOXENV=py36-dj111-sqlite-noelasticsearch
- env: TOXENV=py36-dj111-postgres-noelasticsearch
- env: TOXENV=py36-dj111-mysql-noelasticsearch
- env: TOXENV=py36-dj111-postgres-elasticsearch
- env: TOXENV=py36-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
# Services
services:

4
tox.ini
View file

@ -2,7 +2,8 @@
skipsdist = True
usedevelop = True
envlist = py{27,34,35}-dj{18,110,110head,111}-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
envlist = py{27,34,35}-dj{18,110,110head}-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
py{27,34,35,36}-dj111-{sqlite,postgres,mysql}-{elasticsearch5,elasticsearch2,elasticsearch,noelasticsearch},
flake8
[testenv]
@ -17,6 +18,7 @@ basepython =
py27: python2.7
py34: python3.4
py35: python3.5
py36: python3.6
deps =
django-sendfile==0.3.6