From 86c1d9d9abf72346df32ef6072f6edd4b9f1110e Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Tue, 8 Jan 2019 10:45:06 +0100 Subject: [PATCH 1/2] Add Python 3.7 and Django 1.11 to the build matrix Fixes #1125 --- .travis.yml | 2 ++ tox.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4fe8630bc..ba802780e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ matrix: env: TOXENV=py35-dj111 - python: 3.6 env: TOXENV=py36-dj111 + - python: 3.7 + env: TOXENV=py37-dj111 - python: 3.4 env: TOXENV=py34-dj20 - python: 3.5 diff --git a/tox.ini b/tox.ini index d14b7f71a..aee5df5c9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{27,34,35,36}-dj111 + py{27,34,35,36,37}-dj111 py{34,35,36,37}-dj20 py{35,36,37}-dj21 py{35,36,37}-djmaster From 159bf4dceb43acebb19a54018c2426d6423072d9 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Tue, 8 Jan 2019 11:04:31 +0100 Subject: [PATCH 2/2] Try again --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index aee5df5c9..543c4fae3 100644 --- a/tox.ini +++ b/tox.ini @@ -49,7 +49,7 @@ deps = coverage django_jinja html5lib - mysqlclient + mysqlclient<1.4 selenium<4.0 sqlparse setenv =