Merge pull request #244 from pokoli/py36

Add support for python3.6

.travis.yml

@@ -3,15 +3,29 @@ language: python
 sudo: true
 services:
   - docker
-env:
-  - TOXENV=py35
-  - TOXENV=py34
-  - TOXENV=py27
-  - TOXENV=py27-functional
-  - TOXENV=py35-functional
-  - TOXENV=update-pep8
-  - TOXENV=docs
-  - TOXENV=coverage,codecov
+
+matrix:
+    include:
+     - python: 2.7
+       env: TOXENV=py27
+     - python: 2.7
+       env: TOXENV=py27-functional
+     - python: 2.7
+       env: TOXENV=update-pep8
+     - python: 2.7
+       env: TOXENV=docs
+     - python: 2.7
+       env: TOXENV=coverage,codecov
+     - python: 3.4
+       env: TOXENV=py34
+     - python: 3.5
+       env: TOXENV=py35
+     - python: 3.5
+       env: TOXENV=py35-functional
+     - python: 3.6
+       env: TOXENV=py36
+     - python: 3.6
+       env: TOXENV=py36-functional
 
 install:
   - pip install tox

setup.py

@@ -64,5 +64,6 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
     ],
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35
+envlist = py27, py34, py35, py36
 
 [testenv]
 passenv = TOXENV CI TRAVIS TRAVIS_*
@@ -29,6 +29,11 @@ commands =
    python -V
    {toxinidir}/scripts/kube-init.sh nosetests -v []
 
+[testenv:py36-functional]
+commands =
+   python -V
+   {toxinidir}/scripts/kube-init.sh nosetests -v []
+
 [testenv:coverage]
 commands =
    python -V