From c5e47063abcd7c6a21df8d2e0eaa94b5b20cdc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@upcloud.com>
Date: Sun, 20 May 2018 21:51:35 +0200
Subject: [PATCH] Add Python 3.7 to tox and GitLab CI

---
 .gitlab-ci.yml | 5 +++++
 .travis.yml    | 3 +++
 tox.ini        | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f99bc3..a926a78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,11 @@ python36:
   stage: test
   script: tox -e py36
 
+python37:
+  image: python:3.7-rc
+  stage: test
+  script: tox -e py37
+
 linters:
   image: python:3.5
   stage: test
diff --git a/.travis.yml b/.travis.yml
index 13eb5bf..b47d090 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,9 @@ matrix:
       env: TOXENV=py35
     - python: 3.6
       env: TOXENV=py36
+    # https://github.com/travis-ci/travis-ci/issues/9069
+    #- python: 3.7
+    #  env: TOXENV=py37
     - python: pypy
       env: TOXENV=pypy
     - python: 2.7
diff --git a/tox.ini b/tox.ini
index 2e6a5bb..513bfa9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion=2.3.1
-envlist = py27,py33,py34,py35,py36,flake8,linters,docs
+envlist = py27,py33,py34,py35,py36,py37,flake8,linters,docs
 
 [testenv]
 deps =