Tox cleanup

Author: wsanchez

tox.ini

@@ -48,20 +48,21 @@ deps =
     {[default]deps}
 
     # In Python 2, we need to pull in typing
-    {py26,py27}: typing==3.7.4.1
+    py{26,27,py2}: typing==3.7.4.1
+    py{26,27,py2}: mock==3.0.5  # rq.filter: <4
 
     # For pytest
-    {py26,py27,py34}: pytest==4.6.11
-    {py35,py36,py37,py38}: pytest==5.2.4
+    py{26,27,34,py2}: pytest==4.6.11
+    py{34,35,36,37,38,39,py3}: pytest==5.2.4
 
     # For code coverage
     {[testenv:coverage_report]deps}
-    pytest-cov==2.10.0
+    py{26,27,34,py2}: pytest-cov==2.8.1  # rq.filter: <2.9
+    py{34,35,36,37,38,39,py3}: pytest-cov==2.10.0
 
     # For hypothesis. Note Python 3.4 isn't supported by hypothesis.
-    py27: hypothesis==4.43.9  # rq.filter: <4.44
-    {py35,py36,py37,py38,py39,py2,py3}: hypothesis==5.8.6
-    py27: mock==3.0.5  # rq.filter: <4
+    py{26,27,py2}: hypothesis==4.43.9  # rq.filter: <4.44
+    py{35,36,37,38,39,py3}: hypothesis==5.8.6
 
 setenv =
     {[default]setenv}
@@ -239,7 +240,7 @@ ignore_missing_imports = True
 
 description = generate coverage report
 
-depends = test-py{26,27,34,35,36,37,38,py,py3}
+depends = test-py{26,27,34,35,36,37,38,39,py2,py3}
 
 basepython = {[default]basepython}