diff options
author | Anthony DiGirolamo <tonymd@google.com> | 2021-08-24 10:02:04 -0700 |
---|---|---|
committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2021-08-24 20:51:05 +0000 |
commit | 7f8941f1ebcabaccab687df3becca44226ac9d70 (patch) | |
tree | 414327bcdb3809008b8a4ebd678b38a8253af544 | |
parent | f15b206f3330a8adebf987098c828b534a6f9c5b (diff) | |
download | pigweed-7f8941f1ebcabaccab687df3becca44226ac9d70.tar.gz |
pw_presubmit: Add cfg+toml to sources build check
Add missing setup.cfg and pyproject.toml files to pw_python_package.
No-Docs-Update-Reason: BUILD.gn fix
Change-Id: Ice610d8cb061193582e39ec38d584b047c0cee65
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/57866
Commit-Queue: Anthony DiGirolamo <tonymd@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>
30 files changed, 146 insertions, 29 deletions
diff --git a/pw_allocator/py/BUILD.gn b/pw_allocator/py/BUILD.gn index 0322cb3fa..8b4696adc 100644 --- a/pw_allocator/py/BUILD.gn +++ b/pw_allocator/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_allocator/__init__.py", "pw_allocator/heap_viewer.py", diff --git a/pw_arduino_build/py/BUILD.gn b/pw_arduino_build/py/BUILD.gn index 990f4dbde..731b345e8 100644 --- a/pw_arduino_build/py/BUILD.gn +++ b/pw_arduino_build/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_arduino_build/__init__.py", "pw_arduino_build/__main__.py", diff --git a/pw_bloat/py/BUILD.gn b/pw_bloat/py/BUILD.gn index c6d5ea31c..24379d39e 100644 --- a/pw_bloat/py/BUILD.gn +++ b/pw_bloat/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_bloat/__init__.py", "pw_bloat/binary_diff.py", diff --git a/pw_build/py/BUILD.gn b/pw_build/py/BUILD.gn index f70e34f5b..50de9a64b 100644 --- a/pw_build/py/BUILD.gn +++ b/pw_build/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_build/__init__.py", "pw_build/collect_wheels.py", diff --git a/pw_build/python.rst b/pw_build/python.rst index c5e1898f8..590488569 100644 --- a/pw_build/python.rst +++ b/pw_build/python.rst @@ -90,7 +90,11 @@ This is an example Python package declaration for a ``pw_my_module`` module. import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_my_module/__init__.py", "pw_my_module/alfa.py", diff --git a/pw_cli/py/BUILD.gn b/pw_cli/py/BUILD.gn index ef0c4f7f7..0057e8978 100644 --- a/pw_cli/py/BUILD.gn +++ b/pw_cli/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_cli/__init__.py", "pw_cli/__main__.py", diff --git a/pw_console/py/BUILD.gn b/pw_console/py/BUILD.gn index 89ac66b30..9facd47bd 100644 --- a/pw_console/py/BUILD.gn +++ b/pw_console/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_console/__init__.py", "pw_console/__main__.py", diff --git a/pw_cpu_exception_cortex_m/py/BUILD.gn b/pw_cpu_exception_cortex_m/py/BUILD.gn index efa0b856d..f840c7b3e 100644 --- a/pw_cpu_exception_cortex_m/py/BUILD.gn +++ b/pw_cpu_exception_cortex_m/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_cpu_exception_cortex_m/__init__.py", "pw_cpu_exception_cortex_m/cfsr_decoder.py", diff --git a/pw_docgen/py/BUILD.gn b/pw_docgen/py/BUILD.gn index 13974372e..81ff9bf25 100644 --- a/pw_docgen/py/BUILD.gn +++ b/pw_docgen/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_docgen/__init__.py", "pw_docgen/docgen.py", diff --git a/pw_doctor/py/BUILD.gn b/pw_doctor/py/BUILD.gn index bec5e5939..1750e5dab 100644 --- a/pw_doctor/py/BUILD.gn +++ b/pw_doctor/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_doctor/__init__.py", "pw_doctor/doctor.py", diff --git a/pw_env_setup/py/BUILD.gn b/pw_env_setup/py/BUILD.gn index d5df74808..09055d27d 100644 --- a/pw_env_setup/py/BUILD.gn +++ b/pw_env_setup/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_env_setup/__init__.py", "pw_env_setup/apply_visitor.py", diff --git a/pw_hdlc/py/BUILD.gn b/pw_hdlc/py/BUILD.gn index 572f12df3..8e9c157ff 100644 --- a/pw_hdlc/py/BUILD.gn +++ b/pw_hdlc/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_hdlc/__init__.py", "pw_hdlc/decode.py", diff --git a/pw_log_tokenized/py/BUILD.gn b/pw_log_tokenized/py/BUILD.gn index 54ad83b12..8931cb2d2 100644 --- a/pw_log_tokenized/py/BUILD.gn +++ b/pw_log_tokenized/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_log_tokenized/__init__.py" ] tests = [ "format_string_test.py", diff --git a/pw_module/py/BUILD.gn b/pw_module/py/BUILD.gn index da1b13276..7a53ae7d3 100644 --- a/pw_module/py/BUILD.gn +++ b/pw_module/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_module/__init__.py", "pw_module/check.py", diff --git a/pw_package/py/BUILD.gn b/pw_package/py/BUILD.gn index f81979e76..661b78f5c 100644 --- a/pw_package/py/BUILD.gn +++ b/pw_package/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_package/__init__.py", "pw_package/git_repo.py", diff --git a/pw_presubmit/py/BUILD.gn b/pw_presubmit/py/BUILD.gn index 8c612c9f1..9dba8923e 100644 --- a/pw_presubmit/py/BUILD.gn +++ b/pw_presubmit/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_presubmit/__init__.py", "pw_presubmit/build.py", diff --git a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py index f8d30b744..a78773c6e 100755 --- a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py +++ b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py @@ -655,7 +655,8 @@ def copyright_notice(ctx: PresubmitContext): _BAZEL_SOURCES_IN_BUILD = tuple(format_code.C_FORMAT.extensions) -_GN_SOURCES_IN_BUILD = '.rst', '.py', *_BAZEL_SOURCES_IN_BUILD +_GN_SOURCES_IN_BUILD = ('setup.cfg', '.toml', '.rst', '.py', + *_BAZEL_SOURCES_IN_BUILD) @filter_paths(endswith=(*_GN_SOURCES_IN_BUILD, 'BUILD', '.bzl', '.gn', '.gni')) diff --git a/pw_protobuf/py/BUILD.gn b/pw_protobuf/py/BUILD.gn index 8f363da07..f920ef1bf 100644 --- a/pw_protobuf/py/BUILD.gn +++ b/pw_protobuf/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_protobuf/__init__.py", "pw_protobuf/codegen_pwpb.py", diff --git a/pw_protobuf_compiler/py/BUILD.gn b/pw_protobuf_compiler/py/BUILD.gn index 687cb1af3..0d8321e4e 100644 --- a/pw_protobuf_compiler/py/BUILD.gn +++ b/pw_protobuf_compiler/py/BUILD.gn @@ -18,7 +18,11 @@ import("$dir_pw_build/python.gni") import("$dir_pw_third_party/nanopb/nanopb.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_protobuf_compiler/__init__.py", "pw_protobuf_compiler/generate_protos.py", diff --git a/pw_status/py/BUILD.gn b/pw_status/py/BUILD.gn index d7ee453b0..5bd0b69de 100644 --- a/pw_status/py/BUILD.gn +++ b/pw_status/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_status/__init__.py" ] pylintrc = "$dir_pigweed/.pylintrc" } diff --git a/pw_stm32cube_build/py/BUILD.gn b/pw_stm32cube_build/py/BUILD.gn index efcc86983..04c2c9526 100644 --- a/pw_stm32cube_build/py/BUILD.gn +++ b/pw_stm32cube_build/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_stm32cube_build/__init__.py", "pw_stm32cube_build/__main__.py", diff --git a/pw_tls_client/py/BUILD.gn b/pw_tls_client/py/BUILD.gn index 4ea01c535..6b59a08ee 100644 --- a/pw_tls_client/py/BUILD.gn +++ b/pw_tls_client/py/BUILD.gn @@ -16,7 +16,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_tls_client/__init__.py", "pw_tls_client/generate_test_data.py", diff --git a/pw_tokenizer/py/BUILD.gn b/pw_tokenizer/py/BUILD.gn index 7cf6c86aa..b0006ed10 100644 --- a/pw_tokenizer/py/BUILD.gn +++ b/pw_tokenizer/py/BUILD.gn @@ -70,6 +70,10 @@ pw_python_package("py") { # protobuf module. pw_python_script("setup") { sources = [ "setup.py" ] + inputs = [ + "setup.cfg", + "pyproject.toml", + ] } pw_proto_library("test_proto") { diff --git a/pw_toolchain/py/BUILD.gn b/pw_toolchain/py/BUILD.gn index ee7df0ad5..d58d4d462 100644 --- a/pw_toolchain/py/BUILD.gn +++ b/pw_toolchain/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_toolchain/__init__.py", "pw_toolchain/bad_toolchain.py", diff --git a/pw_trace/py/BUILD.gn b/pw_trace/py/BUILD.gn index 736258c84..a445dd94f 100644 --- a/pw_trace/py/BUILD.gn +++ b/pw_trace/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_trace/__init__.py", "pw_trace/trace.py", diff --git a/pw_trace_tokenized/py/BUILD.gn b/pw_trace_tokenized/py/BUILD.gn index 22ec840b0..4efae83ed 100644 --- a/pw_trace_tokenized/py/BUILD.gn +++ b/pw_trace_tokenized/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_trace_tokenized/__init__.py", "pw_trace_tokenized/get_trace.py", diff --git a/pw_unit_test/py/BUILD.gn b/pw_unit_test/py/BUILD.gn index 0d56d3e90..e882569f7 100644 --- a/pw_unit_test/py/BUILD.gn +++ b/pw_unit_test/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_unit_test/__init__.py", "pw_unit_test/rpc.py", diff --git a/pw_watch/py/BUILD.gn b/pw_watch/py/BUILD.gn index e14d675dd..df85d15a4 100644 --- a/pw_watch/py/BUILD.gn +++ b/pw_watch/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "pw_watch/__init__.py", "pw_watch/debounce.py", diff --git a/targets/lm3s6965evb_qemu/py/BUILD.gn b/targets/lm3s6965evb_qemu/py/BUILD.gn index 36373ff5d..38d0add8c 100644 --- a/targets/lm3s6965evb_qemu/py/BUILD.gn +++ b/targets/lm3s6965evb_qemu/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "lm3s6965evb_qemu_utils/__init__.py", "lm3s6965evb_qemu_utils/unit_test_runner.py", diff --git a/targets/stm32f429i_disc1/py/BUILD.gn b/targets/stm32f429i_disc1/py/BUILD.gn index 85dd2556f..ea35c608f 100644 --- a/targets/stm32f429i_disc1/py/BUILD.gn +++ b/targets/stm32f429i_disc1/py/BUILD.gn @@ -17,7 +17,11 @@ import("//build_overrides/pigweed.gni") import("$dir_pw_build/python.gni") pw_python_package("py") { - setup = [ "setup.py" ] + setup = [ + "pyproject.toml", + "setup.cfg", + "setup.py", + ] sources = [ "stm32f429i_disc1_utils/__init__.py", "stm32f429i_disc1_utils/stm32f429i_detector.py", |