Merge branch 'master' into changes

Author: wsanchez

.gitignore

@@ -1,4 +1,4 @@
-/docs/_build
+/docs/_build/
 tmp.py
 *.py[cod]
 
@@ -37,7 +37,10 @@ nosetests.xml
 /.coverage
 /.coverage.*
 /htmlcov/
-/.mypy_cache
+/.mypy_cache/
+
+# Documentation
+/htmldocs/
 
 # Translations
 *.mo

tox.ini

@@ -2,10 +2,10 @@
 
 envlist =
     flake8, mypy
-    test-py{26,27,34,35,36,37,38,py,py3}
+    test-py{26,27,34,35,36,37,38,py2,py3}
     coverage_report
-    packaging
     docs
+    packaging
 
 skip_missing_interpreters = {tty:True:False}
 
@@ -182,12 +182,12 @@ description = generate coverage report
 
 depends = test-py{26,27,34,35,36,37,38,py,py3}
 
-basepython = python
+basepython = {[default]basepython}
 
 skip_install = True
 
 deps =
-    coverage==4.5.4  # rq.filter: <5
+    coverage==4.5.4  # rq.filter: <5  # coverage 5.0 drops Python 3.4 support
 
 setenv =
     {[default]setenv}
@@ -265,7 +265,7 @@ commands =
     sphinx-build                           \
         -b html -d "{envtmpdir}/doctrees"  \
         "{toxinidir}/docs"                 \
-        "{toxworkdir}/docs/html"
+        "{toxworkdir}/htmldocs"
 
 
 [testenv:docs-auto]
@@ -283,7 +283,7 @@ commands =
         -b html -d "{envtmpdir}/doctrees"  \
         --host=localhost                   \
         "{toxinidir}/docs"                 \
-        "{toxworkdir}/docs/html"
+        "{toxworkdir}/htmldocs"
 
 
 ##