From 3c868255a481ef17deb53f022e668a60957a2f17 Mon Sep 17 00:00:00 2001
From: Miguel Grinberg <miguel.grinberg@gmail.com>
Date: Wed, 18 Jan 2017 15:38:57 -0800
Subject: [PATCH] removed py33 from tests, added py36
---
.travis.yml | 26 ++++++++++++++++++--------
tox.ini | 39 ++++++++++-----------------------------
2 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c2834e7..84e59ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,22 @@
language: python
-env:
- - TOXENV=flake8
- - TOXENV=py27
- - TOXENV=py33
- - TOXENV=py34
- - TOXENV=py35
- - TOXENV=pypy
- - TOXENV=docs
+matrix:
+ include:
+ - python: 2.7
+ env: TOXENV=flake8
+ - python: 3.6
+ env: TOXENV=flake8
+ - python: 2.7
+ env: TOXENV=py27
+ - python: 3.4
+ env: TOXENV=py34
+ - python: 3.5
+ env: TOXENV=py35
+ - python: 3.6
+ env: TOXENV=py36
+ - python: pypy
+ env: TOXENV=pypy
+ - python: 2.7
+ env: TOXENV=docs
install:
- pip install tox
script:
diff --git a/tox.ini b/tox.ini
index e1d894f..3aad8cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist=flake8,py27,py33,py34,py35,pypy,docs,coverage
+envlist=flake8,py27,py34,py35,py36,pypy,docs,coverage
skip_missing_interpreters=True
[testenv]
@@ -7,6 +7,15 @@ commands=
coverage run --branch --include="socketio/*" setup.py test
coverage report --show-missing
coverage erase
+deps=
+ coverage
+ mock
+basepython =
+ py27: python2.7
+ py34: python3.4
+ py35: python3.5
+ py36: python3.6
+ pypy: pypy
[testenv:flake8]
basepython=python
@@ -15,32 +24,6 @@ deps=
commands=
flake8 --exclude=".*" --ignore=E402 socketio tests
-[testenv:py27]
-basepython=python2.7
-deps=
- coverage
- mock
-
-[testenv:py33]
-basepython=python3.3
-deps=
- coverage
-
-[testenv:py34]
-basepython=python3.4
-deps=
- coverage
-
-[testenv:py35]
-basepython=python3.5
-deps=
- coverage
-
-[testenv:pypy]
-basepython=pypy
-deps=
- coverage
-
[testenv:docs]
basepython=python2.7
changedir=docs
@@ -53,8 +36,6 @@ commands=
[testenv:coverage]
basepython=python
-deps=
- coverage
commands=
coverage run --branch --source=socketio setup.py test
coverage html