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

Remove Django 1.11 from CI

Browse source
This commit is contained in:
Matt Westcott 2018-10-17 14:48:46 +01:00 committed by Matt Westcott
parent 565fde0d27
commit f56318a67b
2 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.travis.yml
View file

@ -15,29 +15,14 @@ addons:
matrix:
include:
- env: TOXENV=py34-dj111-postgres-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj111-sqlite-noelasticsearch
python: 3.4
- env: TOXENV=py34-dj20-mysql-noelasticsearch
python: 3.4
- env: TOXENV=py35-dj111-mysql-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.5
sudo: true
- env: TOXENV=py35-dj20-sqlite-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj21-sqlite-noelasticsearch
python: 3.5
- env: TOXENV=py35-dj21-mysql-noelasticsearch
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-dj20-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj21-postgres-noelasticsearch
@ -50,15 +35,9 @@ matrix:
- env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj111-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.6
sudo: true
- env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.6
sudo: true
@ -67,12 +46,9 @@ matrix:
sudo: true
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
- env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
# allow failures against Django master

4
tox.ini
View file

@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{34,35,36}-dj{111,20,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
envlist = py{34,35,36}-dj{20,21,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
[flake8]
# D100: Missing docstring in public module
@ -40,8 +40,6 @@ deps =
django-sendfile==0.3.6
Embedly
dj111: Django>=1.11b1,<2.0
dj111-mssql: django-pyodbc-azure==1.11.0.0
dj20: Django>=2.0,<2.1
dj21: Django>=2.1,<2.2
djmaster: git+https://github.com/django/django.git@master#egg=Django