Merge branch 'master' into travis-lint

Author: wsanchez

tox.ini

@@ -34,7 +34,7 @@ deps =
     test: coverage==4.5.4
     test: idna==2.8
     test: typing==3.7.4.1
-    test: {py26,py27,py34}: pytest==4.6.6
+    test: {py26,py27,py34}: pytest==4.6.7
     test: {py35,py36,py37,py38}: pytest==5.2.4
     test: pytest-cov==2.8.1
 
@@ -83,7 +83,7 @@ deps =
     flake8==3.7.9
     mccabe==0.6.1
     pep8-naming==0.9.1
-    pydocstyle==4.0.1
+    pydocstyle==5.0.0
     # pin pyflakes pending a release with https://github.com/PyCQA/pyflakes/pull/455
     git+git://github.com/PyCQA/pyflakes@ffe9386#egg=pyflakes