summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrina Truong <i.chernyavska@gmail.com>2017-03-03 11:19:33 -0800
committerGitHub <noreply@github.com>2017-03-03 11:19:33 -0800
commit5b2c3151e0c636ca3bf8c5632542167536ebe3d2 (patch)
treeff111705b3d6d327e7673fa16b4fd5e53115fff3
parent132f2bd7583326f75a8673b9b69b08a7e7c0960f (diff)
parent3cb3b4cd6224988a1c1f3ffe9a9ddece0fac7ef2 (diff)
Merge pull request #645 from dbcli/amjith/add-py36
Add python 3.5 and 3.6 to test suite.
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2e2d22f1..92e155a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ python:
- "2.7"
- "3.3"
- "3.4"
+ - "3.5"
+ - "3.6"
install:
- pip install . pytest mock codecov==1.5.1 behave pexpect==3.3
diff --git a/tox.ini b/tox.ini
index d28ddf43..4e04d571 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26, py27, py33, py34
+envlist = py26, py27, py33, py34, py35, py36
[testenv]
deps = pytest
mock