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

Add python3.7 to tox/travis config

Browse source
This commit is contained in:
Matt Westcott 2018-10-17 14:41:02 +01:00 committed by Matt Westcott
parent 9bba692d01
commit 83f8988058
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.travis.yml
View file

@ -5,12 +5,7 @@ dist: trusty
# Use container-based infrastructure
sudo: false
# Install JDK9 for Elasticsearch 5
addons:
apt:
packages:
- oracle-java9-installer
- oracle-java9-set-default
postgresql: "9.6"
matrix:
@ -27,6 +22,18 @@ matrix:
python: 3.6
- env: TOXENV=py36-dj21-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py37-dj20-mysql-noelasticsearch
python: 3.7
dist: xenial
sudo: true
- env: TOXENV=py37-dj21-postgres-noelasticsearch
python: 3.7
dist: xenial
sudo: true
- env: TOXENV=py37-dj21-sqlite-noelasticsearch
python: 3.7
dist: xenial
sudo: true
- env: TOXENV=py36-djmaster-postgres-noelasticsearch
python: 3.6
- env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
@ -44,6 +51,10 @@ matrix:
- env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.6
sudo: true
- env: TOXENV=py37-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
python: 3.7
dist: xenial
sudo: true
allow_failures:
# Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
- env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
@ -51,6 +62,7 @@ matrix:
- env: TOXENV=py36-dj21-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
- env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
- env: TOXENV=py37-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
# allow failures against Django master
- env: TOXENV=py36-djmaster-postgres-noelasticsearch
@ -58,6 +70,7 @@ matrix:
# Services
services:
- elasticsearch
- mysql
# Package installation
install:

3
tox.ini
View file

@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True
envlist = py{34,35,36}-dj{20,21,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
envlist = py{34,35,36,37}-dj{20,21,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
[flake8]
# D100: Missing docstring in public module
@ -35,6 +35,7 @@ basepython =
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
deps =
django-sendfile==0.3.6