summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Banafato <jon@jonafato.com>2017-07-07 11:55:37 -0400
committerJon Banafato <jon@jonafato.com>2017-07-07 11:55:37 -0400
commit4c916b893e84993369d06dee5523cd00ea6b626a (patch)
treedeed941119e13fc2a9575555296840b132390114
parentf19681fc0d1aeb36f56c9c7f07aac83915a59497 (diff)
downloadgitlab-4c916b893e84993369d06dee5523cd00ea6b626a.tar.gz
Declare support for Python 3.6
Add Python 3.6 environments to `tox.ini` and `.travis.yml`.
-rw-r--r--.travis.yml1
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index dd405f5..7c8b9fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ addons:
language: python
python: 2.7
env:
+ - TOX_ENV=py36
- TOX_ENV=py35
- TOX_ENV=py34
- TOX_ENV=py27
diff --git a/tox.ini b/tox.ini
index ef3e68a..bb1b84c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
minversion = 1.6
skipsdist = True
-envlist = py35,py34,py27,pep8
+envlist = py36,py35,py34,py27,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}