tox.ini: re-write file, include unit tests for all supported versions of python

- enable more python3 versions on travis for unit testing

Author: manu-chroma

.travis.yml

@@ -2,7 +2,10 @@ sudo: false
 language: python
 python:
   - 2.7
+  - 3.3
+  - 3.4
   - 3.5
+  - 3.6
 os:
   - linux
 

tox.ini

@@ -1,21 +1,27 @@
 [tox]
-#envlist = py35-lint,py34-lint,py33-lint,py27-lint,py35-unit,py34-unit,py33-unit,py27-unit
-envlist = py27-lint, py27-unit, py35-mypy, py27-pipconflictchecker, py35-unit
+envlist =
+  # py{27,33,34,35.36}-lint,
+  py27-lint
+  py{27,33,34,35,36}-unit,
+  py35-mypy,
+  py27-pipconflictchecker
+
 skipsdist = True
+skip_missing_interpreters = True
 
 [tox:travis]
 2.7 = py27
-3.5 = py35-mypy, py35-unit 
+3.3 = py33-unit
+3.4 = py34-unit
+3.5 = py35
+3.6 = py36-unit
 
 [testenv]
 deps = -rrequirements.txt
+  # py{27,33,34,35,36}-lint: flake8
 
-[testenv:py35-py2_mypy]
-commands = make mypy
-whitelist_externals = make
-deps =
-  -rmypy_requirements.txt
-  -rrequirements.txt
+commands =
+  py{27,33,34,35,36}-unit: python setup.py test
 
 [testenv:py35-mypy]
 commands = make mypy
@@ -24,21 +30,6 @@ deps =
   -rmypy_requirements.txt
   -rrequirements.txt
 
-[testenv:py35-lint]
-commands = flake8 schema_salad setup.py
-whitelist_externals = flake8
-deps = flake8
-
-[testenv:py34-lint]
-commands = flake8 schema_salad setup.py
-whitelist_externals = flake8
-deps = flake8
-
-[testenv:py33-lint]
-commands = flake8 schema_salad setup.py
-whitelist_externals = flake8
-deps = flake8
-
 [testenv:py27-lint]
 commands = flake8 schema_salad setup.py
 whitelist_externals = flake8
@@ -47,17 +38,4 @@ deps = flake8
 [testenv:py27-pipconflictchecker]
 commands = pipconflictchecker
 whitelist_externals = pipconflictchecker
-deps = pip-conflict-checker
-
-
-[testenv:py35-unit]
-commands = python setup.py test
-
-[testenv:py34-unit]
-commands = python setup.py test
-
-[testenv:py33-unit]
-commands = python setup.py test
-
-[testenv:py27-unit]
-commands = python setup.py test
+deps = pip-conflict-checker