summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2017-07-09 08:48:20 +0200
committerGitHub <noreply@github.com>2017-07-09 08:48:20 +0200
commitcb8c1a198276cc6aa2a3ddbf52bcc3866418e9fd (patch)
tree6638b547e5840e0bdc4b868d0e6174361088a1b2
parent46b7f488c3dcd6f2e975f69fe1a378b920721b87 (diff)
parent4c916b893e84993369d06dee5523cd00ea6b626a (diff)
downloadgitlab-cb8c1a198276cc6aa2a3ddbf52bcc3866418e9fd.tar.gz
Merge pull request #286 from jonafato/python3.6
Declare support for Python 3.6
-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}