Merge "tox: Use pre-commit for pep8 target"

Author: Zuul

.pre-commit-config.yaml

@@ -16,6 +16,8 @@ repos:
       - id: debug-statements
         # nova/cmd/manage.py imports pdb on purpose.
         exclude: 'nova/cmd/manage.py'
+      - id: check-json
+        files: .*\.json$
       - id: check-yaml
         files: .*\.(yaml|yml)$
   - repo: https://github.com/Lucas-C/pre-commit-hooks

tox.ini

@@ -107,43 +107,29 @@ extras =
 commands =
   bash tools/mypywrap.sh {posargs}
 
-[testenv:codespell]
-description =
-  Run codespell to check spelling.
-deps =
-  pre-commit
-commands =
-  pre-commit run codespell --all-files --show-diff-on-failure
-
 [testenv:pep8]
 description =
   Run style checks.
 deps =
-  {[testenv]deps}
-  {[testenv:codespell]deps}
-  autopep8
+  pre-commit
 extras =
 commands =
-  {[testenv:mypy]commands}
-  {[testenv:codespell]commands}
-  # check if autopep8 would alter the formatting but don't actually change it
-  # so we can gate on this in the ci
-  autopep8 --exit-code --max-line-length=79 --diff -r nova doc setup.py
-  # since autopep8 only tries to make minimal changes to conform to pep8 we still need to run
-  # our hacking and flake8 check to keep our existing code style consistent.
-  # The full list of issues addressable by autopep8 can be found here
-  # https://pypi.org/project/autopep8/#features
-  bash tools/flake8wrap.sh {posargs}
-  # Check that all JSON files don't have \r\n in line.
-  bash -c "! find doc/ -type f -name *.json | xargs grep -U -n $'\r'"
-  # Check that all included JSON files are valid JSON
-  bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
+  pre-commit run --all-files --show-diff-on-failure
 
 [testenv:autopep8]
 extras =
-deps = autopep8
+deps =
+  pre-commit
+commands =
+  pre-commit run --all-files --show-diff-on-failure autopep8
+
+[testenv:codespell]
+description =
+  Run codespell to check spelling.
+deps =
+  pre-commit
 commands =
-  autopep8 --exit-code --max-line-length=79 --in-place -r nova doc setup.py
+  pre-commit run --all-files --show-diff-on-failure codespell
 
 [testenv:fast8]
 description =