Merge branch 'master' into rooted-fix

Author: wsanchez

tox.ini

@@ -34,7 +34,7 @@ deps =
     test: idna==2.8
     test: typing==3.7.4.1
     test: {py26,py27,py34}: pytest==4.6.6
-    test: {py35,py36,py37,py38}: pytest==5.2.2
+    test: {py35,py36,py37,py38}: pytest==5.2.4
     test: pytest-cov==2.8.1
 
 passenv =
@@ -82,7 +82,7 @@ deps =
     #flake8-pep3101==1.2.1
     flake8==3.7.9
     mccabe==0.6.1
-    pep8-naming==0.9.0
+    pep8-naming==0.9.1
     pydocstyle==4.0.1
 
 commands =