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

Update tox/travis test matrix for Django 3.0 final

Browse source
This commit is contained in:
Matt Westcott 2019-12-17 12:43:46 +00:00
parent 146853914e
commit c31d426910
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.travis.yml
View file

@ -11,21 +11,19 @@ matrix:
python: 3.5
- env: TOXENV=py36-dj21-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py37-dj21-postgres-noelasticsearch
python: 3.7
- env: TOXENV=py37-dj22-sqlite-noelasticsearch
python: 3.7
- env: TOXENV=py37-dj22-mysql-noelasticsearch
- env: TOXENV=py37-dj21-sqlite-noelasticsearch
python: 3.7
- env: TOXENV=py37-dj22-postgres-noelasticsearch
python: 3.7
- env: TOXENV=py37-dj22stable-postgres-noelasticsearch
- env: TOXENV=py37-dj30-sqlite-noelasticsearch
python: 3.7
- env: TOXENV=py37-dj30stable-postgres-noelasticsearch
- env: TOXENV=py37-dj30-mysql-noelasticsearch
python: 3.7
- env: TOXENV=py37-djmaster-postgres-noelasticsearch
python: 3.7
- env: TOXENV=py38-dj22-postgres-noelasticsearch
- env: TOXENV=py38-dj30-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py38-dj30stable-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py38-djmaster-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
@ -39,6 +37,8 @@ matrix:
python: 3.7
- env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
python: 3.8
- env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
python: 3.8
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
@ -47,12 +47,11 @@ matrix:
- env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py37-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
- env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
# allow failures against Django 2.2.x stable branch
- env: TOXENV=py37-dj22stable-postgres-noelasticsearch
- env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
# allow failures against Django 3.0.x stable branch
- env: TOXENV=py37-dj30stable-postgres-noelasticsearch
- env: TOXENV=py38-dj30stable-postgres-noelasticsearch
# allow failures against Django master
- env: TOXENV=py37-djmaster-postgres-noelasticsearch
- env: TOXENV=py38-djmaster-postgres-noelasticsearch
# Services
services:

6
tox.ini
View file

@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{35,36,37}-dj{21,22,22stable,30stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
envlist = py{35,36,37}-dj{21,22,30,30stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
[testenv]
install_command = pip install -e ".[testing]" -U {opts} {packages}
@ -25,13 +25,11 @@ deps =
dj21: Django>=2.1,<2.2
dj22: Django>=2.2,<2.3
dj22stable: git+https://github.com/django/django.git@stable/2.2.x#egg=Django
dj30: Django>=3.0,<3.1
dj30stable: git+https://github.com/django/django.git@stable/3.0.x#egg=Django
dj30stable: git+https://github.com/wagtail/django-modelcluster.git
dj30stable: git+https://github.com/encode/django-rest-framework.git
djmaster: git+https://github.com/django/django.git@master#egg=Django
djmaster: git+https://github.com/wagtail/django-modelcluster.git
djmaster: git+https://github.com/encode/django-rest-framework.git
postgres: psycopg2>=2.6
mysql: mysqlclient>=1.3.7,<1.4