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

openstack/nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2023年12月20日 15:03:46 +00:00

committed by Gerrit Code Review

parent a43728d33b 2ffdf2e917

commit 80a2b018df

2 changed files with 19 additions and 31 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml

View File

@@ -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

48
tox.ini

View File

@@ -107,43 +107,29 @@ extras =

commands =

bash tools/mypywrap.sh {posargs}

[testenv:pep8]

description =

Run style checks.

deps =

pre-commit

extras =

commands =

pre-commit run --all-files --show-diff-on-failure

[testenv:autopep8]

extras =

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 =

pre-commit run codespell --all-files --show-diff-on-failure

[testenv:pep8]

description =

Run style checks.

deps =

{[testenv]deps}

{[testenv:codespell]deps}

autopep8

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'

[testenv:autopep8]

extras =

deps = autopep8

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 =