Skip to content

Commit 93f3f94

Browse files
authored
Merge pull request #244 from pokoli/py36
Add support for python3.6
2 parents ff94d26 + 20fa5b4 commit 93f3f94

File tree

3 files changed

+30
-10
lines changed

3 files changed

+30
-10
lines changed

.travis.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,29 @@ language: python
33
sudo: true
44
services:
55
- docker
6-
env:
7-
- TOXENV=py35
8-
- TOXENV=py34
9-
- TOXENV=py27
10-
- TOXENV=py27-functional
11-
- TOXENV=py35-functional
12-
- TOXENV=update-pep8
13-
- TOXENV=docs
14-
- TOXENV=coverage,codecov
6+
7+
matrix:
8+
include:
9+
- python: 2.7
10+
env: TOXENV=py27
11+
- python: 2.7
12+
env: TOXENV=py27-functional
13+
- python: 2.7
14+
env: TOXENV=update-pep8
15+
- python: 2.7
16+
env: TOXENV=docs
17+
- python: 2.7
18+
env: TOXENV=coverage,codecov
19+
- python: 3.4
20+
env: TOXENV=py34
21+
- python: 3.5
22+
env: TOXENV=py35
23+
- python: 3.5
24+
env: TOXENV=py35-functional
25+
- python: 3.6
26+
env: TOXENV=py36
27+
- python: 3.6
28+
env: TOXENV=py36-functional
1529

1630
install:
1731
- pip install tox

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,6 @@
6464
"Programming Language :: Python :: 3",
6565
"Programming Language :: Python :: 3.4",
6666
"Programming Language :: Python :: 3.5",
67+
"Programming Language :: Python :: 3.6",
6768
],
6869
)

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py34, py35
2+
envlist = py27, py34, py35, py36
33

44
[testenv]
55
passenv = TOXENV CI TRAVIS TRAVIS_*
@@ -29,6 +29,11 @@ commands =
2929
python -V
3030
{toxinidir}/scripts/kube-init.sh nosetests -v []
3131

32+
[testenv:py36-functional]
33+
commands =
34+
python -V
35+
{toxinidir}/scripts/kube-init.sh nosetests -v []
36+
3237
[testenv:coverage]
3338
commands =
3439
python -V

0 commit comments

Comments
 (0)