Merge "Adapt to tox 4.x"

tox.ini

@@ -1,7 +1,6 @@
 [tox]
 minversion = 3.18.0
 envlist = linters,py
-skipsdist = True
 
 # Automatic envs will only use the python version appropriate to that
 # env and ignore basepython inherited from [testenv] if we set
@@ -47,9 +46,9 @@ commands = bash -c "{toxinidir}/scripts/bindep-install"
 # deprecated: covered by linters
 [testenv:pep8]
 skip_install = true
-deps =
+deps = {[testenv:linters]deps}
 commands =
-    tox -e linters -- flake8
+    python -m pre_commit run -a -- flake8
 
 [testenv:venv]
 commands = {posargs}
@@ -77,9 +76,9 @@ commands = oslo_debug_helper {posargs}
 # deprecated: covered by linters
 [testenv:bashate]
 skip_install = true
-deps =
+deps = {[testenv:linters]deps}
 commands =
-    tox -e linters -- bashate
+    python -m pre_commit run -a -- bashate
 
 [testenv:linters]
 skip_install = true