From 74024aee139cb84f8cdcb222c782910593e3a1be Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 17 Feb 2026 15:10:40 +0000 Subject: [PATCH 1/3] ci/tools: Remove YAPF Signed-off-by: Ryan Northey --- .gitignore | 2 -- .style.yapf | 15 --------------- .yapfignore | 8 -------- tools/base/requirements.in | 1 - tools/code/BUILD | 16 ++++++++++++++++ 5 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 .style.yapf delete mode 100644 .yapfignore diff --git a/.gitignore b/.gitignore index 02cc3a962f0dd..fb40cbde2890d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,9 +30,7 @@ !.github !.gitignore !.python-version -!.style.yapf !.yamllint -!.yapfignore !.zuul !.zuul.yaml diff --git a/.style.yapf b/.style.yapf deleted file mode 100644 index 303900902866b..0000000000000 --- a/.style.yapf +++ /dev/null @@ -1,15 +0,0 @@ -# The Google Python styles can be found here: https://github.com/google/styleguide/blob/gh-pages/pyguide.md -# TODO: Look into enforcing single vs double quote. -[style] -based_on_style=Google -indent_width=4 -column_limit=100 -split_before_first_argument=True -coalesce_brackets=True -split_before_logical_operator=True -split_complex_comprehension=True -split_before_expression_after_opening_paren=True -split_before_dict_set_generator=True -split_before_arithmetic_operator=True -split_before_bitwise_operator=True -# blank_line_before_nested_def_ diff --git a/.yapfignore b/.yapfignore deleted file mode 100644 index f0b729545dc90..0000000000000 --- a/.yapfignore +++ /dev/null @@ -1,8 +0,0 @@ -*generated* -*venv* -*protos* -*~ -*_pb2.py -*tests* -*#* -*intersphinx_custom.py diff --git a/tools/base/requirements.in b/tools/base/requirements.in index b354b02a0d379..a931a59f0ccb0 100644 --- a/tools/base/requirements.in +++ b/tools/base/requirements.in @@ -43,5 +43,4 @@ setuptools slack_sdk thrift verboselogs -yapf yarl>=1.17.2 diff --git a/tools/code/BUILD b/tools/code/BUILD index 87b8ae3d1d01a..649036345c75d 100644 --- a/tools/code/BUILD +++ b/tools/code/BUILD @@ -10,6 +10,20 @@ load( licenses(["notice"]) # Apache 2 +CODE_CHECKS=[ + "changelog", + "extensions_fuzzed", + "extensions_metadata", + "extensions_owners", + "extensions_registered", + "glint", + "gofmt", + "python_flake8", + "runtime_guards", + "shellcheck", + "yamllint", +] + FUZZ_FILTER_COUNT = ( len(READFILTER_FUZZ_FILTERS) + len(READFILTER_NOFUZZ_FILTERS) @@ -34,6 +48,7 @@ py_console_script_binary( "--extensions_build_config=$(location :extensions_build_config)", "--extensions_fuzzed_count=%s" % FUZZ_FILTER_COUNT, "--path=%s" % PATH, + "-c %s" % ",".join(CODE_CHECKS), "-b shellcheck:$(location @shellcheck)", "-b gofmt:$(location @go_sdk//:bin/gofmt)", "-x bazel/repo.bzl", @@ -64,6 +79,7 @@ genrule( --extensions_build_config=$(location :extensions_build_config) \ --extensions_fuzzed_count=%s \ --path=%s \ + "-c %s" % ",".join(CODE_CHECKS), -b shellcheck:$(location @shellcheck) \ -b gofmt:$(location @go_sdk//:bin/gofmt) \ > $@ 2>&1 || : From 7cd2254d776084d21285873ca291f20e912966e9 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 17 Feb 2026 17:08:34 +0000 Subject: [PATCH 2/3] bazel-fixes Signed-off-by: Ryan Northey --- tools/code/BUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/code/BUILD b/tools/code/BUILD index 649036345c75d..2b0934978b8f5 100644 --- a/tools/code/BUILD +++ b/tools/code/BUILD @@ -10,7 +10,7 @@ load( licenses(["notice"]) # Apache 2 -CODE_CHECKS=[ +CODE_CHECKS = [ "changelog", "extensions_fuzzed", "extensions_metadata", @@ -79,13 +79,14 @@ genrule( --extensions_build_config=$(location :extensions_build_config) \ --extensions_fuzzed_count=%s \ --path=%s \ - "-c %s" % ",".join(CODE_CHECKS), + -c %s \ -b shellcheck:$(location @shellcheck) \ -b gofmt:$(location @go_sdk//:bin/gofmt) \ > $@ 2>&1 || : """ % ( FUZZ_FILTER_COUNT, PATH, + ",".join(CODE_CHECKS), ), tags = ["no-remote-exec"], tools = [ From 7f385d48b2c2b8efe3f48f6ece5a86164d8716c6 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 17 Feb 2026 21:47:27 +0000 Subject: [PATCH 3/3] arg-fix Signed-off-by: Ryan Northey --- tools/code/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/code/BUILD b/tools/code/BUILD index 2b0934978b8f5..c6136a4da7551 100644 --- a/tools/code/BUILD +++ b/tools/code/BUILD @@ -48,7 +48,7 @@ py_console_script_binary( "--extensions_build_config=$(location :extensions_build_config)", "--extensions_fuzzed_count=%s" % FUZZ_FILTER_COUNT, "--path=%s" % PATH, - "-c %s" % ",".join(CODE_CHECKS), + "-c %s" % " ".join(CODE_CHECKS), "-b shellcheck:$(location @shellcheck)", "-b gofmt:$(location @go_sdk//:bin/gofmt)", "-x bazel/repo.bzl", @@ -86,7 +86,7 @@ genrule( """ % ( FUZZ_FILTER_COUNT, PATH, - ",".join(CODE_CHECKS), + " ".join(CODE_CHECKS), ), tags = ["no-remote-exec"], tools = [