0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-25 13:10:14 +01:00

test against Django master

This commit is contained in:
Matt Westcott 2018-08-14 14:47:18 +01:00
parent cac8fa09ba
commit 6817eda153
2 changed files with 6 additions and 1 deletions

View File

@ -44,6 +44,8 @@ matrix:
python: 3.6
- env: TOXENV=py36-dj21-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-djmaster-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
python: 3.6
sudo: true
@ -83,6 +85,8 @@ matrix:
- 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
- env: TOXENV=py36-djmaster-postgres-noelasticsearch
# Services

View File

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