Merge branch 'master' into black

Author: wsanchez

tox.ini

@@ -108,7 +108,7 @@ deps =
     flake8-bugbear==20.1.4
     flake8==3.7.9
     mccabe==0.6.1
-    pep8-naming==0.9.1
+    pep8-naming==0.10.0
     pycodestyle==2.5.0
     pydocstyle==5.0.2
     # pin pyflakes pending a release with https://github.com/PyCQA/pyflakes/pull/455