From e2070c01dfcf54c6b514d10e508cba4bb85fe8b5 Mon Sep 17 00:00:00 2001 From: Anthony DiGirolamo Date: Tue, 3 May 2022 16:45:59 -0700 Subject: [PATCH] pw_env_setup: Fix :python.tests target Running ninja -C out python.tests was not running the Python tests. This broke pw presubmit checks. Also remove pw_* pip dependencies from existing setup.cfg files. Change-Id: Ib9815ce9d9a9b08aae3d3cfa5836076a7b75a8e8 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/93600 Pigweed-Auto-Submit: Anthony DiGirolamo Commit-Queue: Anthony DiGirolamo Reviewed-by: Wyatt Hepler Reviewed-by: Armando Montanez --- pw_allocator/py/setup.cfg | 2 +- pw_bloat/py/setup.cfg | 1 - pw_build/py/setup.cfg | 3 --- pw_console/py/setup.cfg | 2 -- pw_cpu_exception_cortex_m/py/setup.cfg | 2 -- pw_env_setup/BUILD.gn | 4 +--- pw_hdlc/py/setup.cfg | 4 ---- pw_presubmit/py/setup.cfg | 2 -- pw_protobuf/py/setup.cfg | 1 - pw_protobuf_compiler/py/setup.cfg | 1 - pw_system/py/setup.cfg | 6 ------ pw_tls_client/py/setup.cfg | 3 ++- pw_trace_tokenized/py/setup.cfg | 3 --- pw_unit_test/py/setup.cfg | 2 +- pw_watch/py/setup.cfg | 4 +++- 15 files changed, 8 insertions(+), 32 deletions(-) diff --git a/pw_allocator/py/setup.cfg b/pw_allocator/py/setup.cfg index 4f1a6fdb3e..3aa3264a52 100644 --- a/pw_allocator/py/setup.cfg +++ b/pw_allocator/py/setup.cfg @@ -21,7 +21,7 @@ description = Pigweed heap allocator [options] packages = find: zip_safe = False -install_requires = pw_cli +install_requires = [options.package_data] pw_allocator = py.typed diff --git a/pw_bloat/py/setup.cfg b/pw_bloat/py/setup.cfg index b1f87faa93..65c184cb7f 100644 --- a/pw_bloat/py/setup.cfg +++ b/pw_bloat/py/setup.cfg @@ -22,7 +22,6 @@ description = Tools for generating binary size report cards packages = find: zip_safe = False install_requires = - pw_cli pyelftools [options.package_data] diff --git a/pw_build/py/setup.cfg b/pw_build/py/setup.cfg index 72f76984ae..df953ca29a 100644 --- a/pw_build/py/setup.cfg +++ b/pw_build/py/setup.cfg @@ -24,9 +24,6 @@ zip_safe = False install_requires = wheel coverage - pw_cli - pw_env_setup - pw_presubmit [options.entry_points] console_scripts = diff --git a/pw_console/py/setup.cfg b/pw_console/py/setup.cfg index d16c4734c4..4e7f0a8bbe 100644 --- a/pw_console/py/setup.cfg +++ b/pw_console/py/setup.cfg @@ -26,8 +26,6 @@ install_requires = Jinja2 prompt_toolkit>=3.0.26 ptpython>=3.0.20 - pw_cli - pw_log_tokenized Pygments pygments-style-dracula pygments-style-tomorrow diff --git a/pw_cpu_exception_cortex_m/py/setup.cfg b/pw_cpu_exception_cortex_m/py/setup.cfg index 178a77a64c..d6fd9330c1 100644 --- a/pw_cpu_exception_cortex_m/py/setup.cfg +++ b/pw_cpu_exception_cortex_m/py/setup.cfg @@ -23,8 +23,6 @@ packages = find: zip_safe = False install_requires = protobuf - pw_cli - pw_protobuf_compiler [options.package_data] pw_cpu_exception_cortex_m = py.typed diff --git a/pw_env_setup/BUILD.gn b/pw_env_setup/BUILD.gn index af86dd92a5..44cce8b35b 100644 --- a/pw_env_setup/BUILD.gn +++ b/pw_env_setup/BUILD.gn @@ -65,13 +65,11 @@ _pigweed_python_deps = [ ] pw_python_group("python") { - python_deps = [] + python_deps = _pigweed_python_deps if (pw_build_USE_NEW_PYTHON_BUILD) { # This target creates and installs Python package named 'pigweed' including # every package listed in _pigweed_python_deps. python_deps += [ ":pip_install_pigweed_package" ] - } else { - python_deps += _pigweed_python_deps } python_deps += [ # Standalone scripts diff --git a/pw_hdlc/py/setup.cfg b/pw_hdlc/py/setup.cfg index b3b18a3a12..e0447cda1e 100644 --- a/pw_hdlc/py/setup.cfg +++ b/pw_hdlc/py/setup.cfg @@ -23,10 +23,6 @@ packages = find: zip_safe = False install_requires = ipython - pw_console - pw_protobuf_compiler - pw_rpc -tests_require = pw_build [options.package_data] pw_hdlc = py.typed diff --git a/pw_presubmit/py/setup.cfg b/pw_presubmit/py/setup.cfg index 14652af9d2..82dcf55081 100644 --- a/pw_presubmit/py/setup.cfg +++ b/pw_presubmit/py/setup.cfg @@ -24,8 +24,6 @@ zip_safe = False install_requires = scan-build==2.0.19 yapf==0.31.0 - pw_cli - pw_package [options.package_data] pw_presubmit = py.typed diff --git a/pw_protobuf/py/setup.cfg b/pw_protobuf/py/setup.cfg index a2bbc18056..f391b257f6 100644 --- a/pw_protobuf/py/setup.cfg +++ b/pw_protobuf/py/setup.cfg @@ -23,7 +23,6 @@ packages = find: zip_safe = False install_requires = protobuf - pw_cli graphlib-backport;python_version<'3.9' [options.entry_points] diff --git a/pw_protobuf_compiler/py/setup.cfg b/pw_protobuf_compiler/py/setup.cfg index 09b0f7b14d..a7e24b4a67 100644 --- a/pw_protobuf_compiler/py/setup.cfg +++ b/pw_protobuf_compiler/py/setup.cfg @@ -27,7 +27,6 @@ install_requires = # This must also be specified in //pw_protobuf_compiler/BUILD.gn mypy-protobuf==2.9 protobuf - pw_cli types-protobuf [options.package_data] diff --git a/pw_system/py/setup.cfg b/pw_system/py/setup.cfg index b71b3b1598..989a099e1d 100644 --- a/pw_system/py/setup.cfg +++ b/pw_system/py/setup.cfg @@ -22,12 +22,6 @@ description = Pigweed System packages = find: zip_safe = False install_requires = - pw_cli - pw_console - pw_hdlc - pw_protobuf_compiler - pw_rpc - pw_tokenizer [options.entry_points] console_scripts = pw-system-console = pw_system.console:main diff --git a/pw_tls_client/py/setup.cfg b/pw_tls_client/py/setup.cfg index 6a52caeb4c..3fceb695c8 100644 --- a/pw_tls_client/py/setup.cfg +++ b/pw_tls_client/py/setup.cfg @@ -21,7 +21,8 @@ description = pw_tls_client python package [options] packages = find: zip_safe = False -install_requires = cryptography +install_requires = + cryptography [options.package_data] pw_tls_client = py.typed diff --git a/pw_trace_tokenized/py/setup.cfg b/pw_trace_tokenized/py/setup.cfg index 5a5cfb234d..6c643bb4ab 100644 --- a/pw_trace_tokenized/py/setup.cfg +++ b/pw_trace_tokenized/py/setup.cfg @@ -22,9 +22,6 @@ description = pw_trace backend to tokenize trace events packages = find: zip_safe = False install_requires = - pw_hdlc - pw_tokenizer - pw_trace [options.package_data] pw_trace_tokenized = py.typed diff --git a/pw_unit_test/py/setup.cfg b/pw_unit_test/py/setup.cfg index c73ce69221..27cce253af 100644 --- a/pw_unit_test/py/setup.cfg +++ b/pw_unit_test/py/setup.cfg @@ -21,7 +21,7 @@ description = Unit tests for Pigweed projects [options] packages = find: zip_safe = False -install_requires = pw_cli; pw_rpc; pw_unit_test_proto +install_requires = [options.package_data] pw_unit_test = py.typed diff --git a/pw_watch/py/setup.cfg b/pw_watch/py/setup.cfg index 504489c0b8..1d887576a4 100644 --- a/pw_watch/py/setup.cfg +++ b/pw_watch/py/setup.cfg @@ -21,7 +21,9 @@ description = Pigweed automatic builder [options] packages = find: zip_safe = False -install_requires = httpwatcher; pw_cli; watchdog>=2.1.0 +install_requires = + httpwatcher + watchdog>=2.1.0 [options.package_data] pw_watch = py.typed