From 27ace7a6a83eb44bd153a02fe0dd5c339dd0b955 Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Fri, 8 Jul 2022 10:51:16 -0600 Subject: ec: Adjust config files for python formatting To support formatting all python files with black, isort, and flake8, move some settings from the zmake dir to the root dir. Removed isort from zmake/run_tests.sh, because moving the .isort.cfg confused it, and it needs to be removed anyway. BRANCH=None BUG=b:238434058 TEST=None Signed-off-by: Jeremy Bettis Change-Id: I30d98015a56022ad9f95fdb3b0a7ed6c4bf24094 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3749241 Auto-Submit: Jeremy Bettis Commit-Queue: Jack Rosenthal Reviewed-by: Jack Rosenthal Commit-Queue: Jeremy Bettis Tested-by: Jeremy Bettis --- zephyr/zmake/.flake8 | 9 --------- zephyr/zmake/.isort.cfg | 2 -- zephyr/zmake/.pylintrc | 7 +------ zephyr/zmake/run_tests.sh | 3 --- 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 zephyr/zmake/.flake8 delete mode 100644 zephyr/zmake/.isort.cfg (limited to 'zephyr/zmake') diff --git a/zephyr/zmake/.flake8 b/zephyr/zmake/.flake8 deleted file mode 100644 index 0a0a9c29ab..0000000000 --- a/zephyr/zmake/.flake8 +++ /dev/null @@ -1,9 +0,0 @@ -[flake8] -max-line-length = 88 -extend-ignore = E203 -exclude = - .hypothesis, - .pytest_cache, - __pycache__, - build, - dist diff --git a/zephyr/zmake/.isort.cfg b/zephyr/zmake/.isort.cfg deleted file mode 100644 index b9fb3f3e8c..0000000000 --- a/zephyr/zmake/.isort.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[settings] -profile=black diff --git a/zephyr/zmake/.pylintrc b/zephyr/zmake/.pylintrc index a33a1fde1c..1f6856615d 100644 --- a/zephyr/zmake/.pylintrc +++ b/zephyr/zmake/.pylintrc @@ -3,12 +3,7 @@ init-hook='import sys; sys.path.extend(["zephyr/zmake"])' [MESSAGES CONTROL] -disable=bad-continuation,bad-whitespace,format,fixme,wrong-import-order - -[format] - -max-line-length=88 -string-quote=double +disable=format,fixme,wrong-import-order [BASIC] good-names= diff --git a/zephyr/zmake/run_tests.sh b/zephyr/zmake/run_tests.sh index 4796704440..0015614c23 100755 --- a/zephyr/zmake/run_tests.sh +++ b/zephyr/zmake/run_tests.sh @@ -25,9 +25,6 @@ export PYTHONPATH="${PWD}" # happens. Remove this flag. pytest --hypothesis-profile=cq . -# Check import sorting. -isort --check . - # Check black formatting. black --check --diff . -- cgit v1.2.1