From 20fa5b4ded20fa3a8cb0dbe12401da57459b38b1 Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Tue, 6 Jun 2017 10:29:48 +0200 Subject: [PATCH] Add support for python3.6 --- .travis.yml | 32 +++++++++++++++++++++++--------- setup.py | 1 + tox.ini | 7 ++++++- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17993ef14..172f548ba 100644 --- a/.travis.yml +++ b/.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 diff --git a/setup.py b/setup.py index 8dd87296b..188e93c50 100644 --- a/setup.py +++ b/setup.py @@ -64,5 +64,6 @@ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", ], ) diff --git a/tox.ini b/tox.ini index 4091bcae6..dfcaace26 100644 --- a/tox.ini +++ b/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