summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@upcloud.com>2018-05-20 21:51:35 +0200
committerVille Skyttä <ville.skytta@upcloud.com>2018-05-20 22:01:25 +0200
commitc5e47063abcd7c6a21df8d2e0eaa94b5b20cdc31 (patch)
treef53562f05df54d5424ba55d229637be12734dfea
parentd6ab32112f06e49f5f7889889c0903af15321825 (diff)
downloadflake8-c5e47063abcd7c6a21df8d2e0eaa94b5b20cdc31.tar.gz
Add Python 3.7 to tox and GitLab CI
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--.travis.yml3
-rw-r--r--tox.ini2
3 files changed, 9 insertions, 1 deletions
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 =