Add Django 2.0 to travis

pull/4101/merge
Matt Westcott 2017-12-01 15:16:13 +00:00 zatwierdzone przez Karl Hobley
rodzic d0ce34b869
commit c2af41b4b9
2 zmienionych plików z 11 dodań i 1 usunięć

Wyświetl plik

@ -31,17 +31,24 @@ matrix:
python: 3.6
- env: TOXENV=py36-dj111-mysql-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj20-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj111-postgres-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-dj20-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
python: 3.6
sudo: true
allow_failures:
- env: TOXENV=py36-dj20-postgres-noelasticsearch
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
- env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
- env: TOXENV=py36-dj20-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
# Services
services:

Wyświetl plik

@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{34,35,36}-dj111-{sqlite,postgres,mysql,mssql}-{elasticsearch5,elasticsearch2,noelasticsearch},
envlist = py{34,35,36}-dj{111,20}-{sqlite,postgres,mysql,mssql}-{elasticsearch5,elasticsearch2,noelasticsearch},
[flake8]
# D100: Missing docstring in public module
@ -41,6 +41,9 @@ deps =
dj111: Django>=1.11b1,<2.0
dj111-mssql: django-pyodbc-azure==1.11.0.0
dj20: Django==2.0rc1
dj20: git+https://github.com/jdufresne/django-taggit.git@dj20
dj20: git+https://github.com/wagtail/django-modelcluster.git
postgres: psycopg2>=2.6
mysql: mysqlclient==1.3.6
elasticsearch2: elasticsearch>=2,<3