Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-03-16 22:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make elasticsearch switchable in tox, allow ES failures in travis

Browse source
This commit is contained in:
Matt Westcott 2016-05-03 10:57:36 +01:00
parent 5976e66cfb
commit 2e48901f38
2 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
.travis.yml
View file

@ -6,44 +6,53 @@ sudo: false
matrix:
include:
- env: TOXENV=py27-dj18-postgres
- env: TOXENV=py27-dj18-postgres-noelasticsearch
python: 2.7
- env: TOXENV=py27-dj18-mysql
- env: TOXENV=py27-dj18-mysql-noelasticsearch
python: 2.7
- env: TOXENV=py27-dj18-sqlite
- env: TOXENV=py27-dj18-sqlite-noelasticsearch
python: 2.7
- env: TOXENV=py33-dj18-postgres
- env: TOXENV=py33-dj18-postgres-noelasticsearch
python: 3.3
- env: TOXENV=py34-dj18-postgres
- env: TOXENV=py34-dj18-postgres-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj18-sqlite
- env: TOXENV=py34-dj18-sqlite-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj18-mysql
- env: TOXENV=py34-dj18-mysql-noelasticsearch
python: 3.4
- env: TOXENV=py35-dj18-postgres
- env: TOXENV=py35-dj18-postgres-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj18-sqlite
- env: TOXENV=py35-dj18-sqlite-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj18-mysql
- env: TOXENV=py35-dj18-mysql-noelasticsearch
python: 3.5
- env: TOXENV=py27-dj19-postgres
- env: TOXENV=py27-dj19-postgres-noelasticsearch
python: 2.7
# - env: TOXENV=py27-dj19-mysql
# - env: TOXENV=py27-dj19-sqlite
# - env: TOXENV=py33-dj19-postgres
- env: TOXENV=py34-dj19-postgres
- env: TOXENV=py34-dj19-postgres-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj19-sqlite
- env: TOXENV=py34-dj19-sqlite-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj19-mysql
- env: TOXENV=py34-dj19-mysql-noelasticsearch
python: 3.4
- env: TOXENV=py35-dj19-postgres
- env: TOXENV=py35-dj19-postgres-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj19-sqlite
- env: TOXENV=py35-dj19-sqlite-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj19-mysql
- env: TOXENV=py35-dj19-mysql-noelasticsearch
python: 3.5
- env: TOXENV=py27-dj18-sqlite-elasticsearch
python: 2.7
- env: TOXENV=py27-dj19-postgres-elasticsearch
python: 2.7
- env: TOXENV=py35-dj18-postgres-elasticsearch
python: 3.5
- env: TOXENV=py35-dj19-sqlite-elasticsearch
python: 3.5
allow_failures:
- env: TOXENV=py27-dj18-sqlite-elasticsearch
- env: TOXENV=py27-dj19-postgres-elasticsearch
- env: TOXENV=py35-dj18-postgres-elasticsearch
- env: TOXENV=py35-dj19-sqlite-elasticsearch
# Services
services:

6
tox.ini
View file

@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{27,33,34,35}-dj{18,19}-{sqlite,postgres,mysql}, flake8
envlist = py{27,33,34,35}-dj{18,19}-{sqlite,postgres,mysql}-{elasticsearch,noelasticsearch}, flake8
[flake8]
ignore = E501,E303
@ -10,7 +10,9 @@ exclude = wagtail/project_template/*
max-line-length = 120
[testenv]
commands=coverage run runtests.py --elasticsearch
commands =
elasticsearch: coverage run runtests.py wagtail.wagtailsearch --elasticsearch
noelasticsearch: coverage run runtests.py
basepython =
py27: python2.7