Merge branch 'py37' into 'master'

Add Python 3.7 to tox and GitLab CI See merge request pycqa/flake8!234
pawmar · May 21, 2018 · 33e7eae · 33e7eae
2 parents 63b603c + c5e4706
commit 33e7eae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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 =