Update tox/travis config to test against Django 3.1 stable branch

pull/6276/head
Matt Westcott 2020-07-03 15:36:19 +01:00 zatwierdzone przez Matt Westcott
rodzic 4bf28b502c
commit 884b055289
2 zmienionych plików z 8 dodań i 5 usunięć

Wyświetl plik

@ -21,6 +21,8 @@ matrix:
python: 3.8
- env: TOXENV=py38-dj30stable-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py38-dj31stable-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py38-djmaster-postgres-noelasticsearch
python: 3.8
- env: TOXENV=py36-dj22-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
@ -40,9 +42,9 @@ matrix:
- env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
- env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
# allow failures against Django 3.0.x stable branch
# allow failures against Django pre-releases on git
- env: TOXENV=py38-dj30stable-postgres-noelasticsearch
# allow failures against Django master
- env: TOXENV=py38-dj31stable-postgres-noelasticsearch
- env: TOXENV=py38-djmaster-postgres-noelasticsearch
# Services

Wyświetl plik

@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{35,36,37}-dj{22,30,30stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
envlist = py{35,36,37}-dj{22,30,30stable,31stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
[testenv]
install_command = pip install -e ".[testing]" -U {opts} {packages}
@ -26,9 +26,10 @@ deps =
dj22: Django>=2.2,<2.3
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
dj31stable: git+https://github.com/django/django.git@stable/3.1.x#egg=Django
dj31stable: 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