Merge branch 'master' into development

Author: SharpBit

tox.ini

@@ -1,18 +1,15 @@
 [flake8]
 max-line-length=120
-exclude = __init__.py,.tox
+exclude = __init__.py
 ignore = E252,E302,E731,W605
 
 [tox]
 envlist = py35,py36,py37,py38
 
 [testenv]
-changedir = tests
 deps = -r{toxinidir}/requirements-dev.txt
-sitepackages = true
-whitelist_externals = flake8,pytest
 commands =
-    flake8
+    flake8 tests
     pytest
 passenv =
     token