From: John Mulligan Date: Tue, 7 May 2024 18:06:05 +0000 (-0400) Subject: pybind/mgr: use tox.ini envlist defaults when run via cmake X-Git-Tag: v20.0.0~1618^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d03e9841fe077c52d316becade5a01b2eb2987e;p=ceph.git pybind/mgr: use tox.ini envlist defaults when run via cmake Instead of having to remember there are two different envlists, one default in tox.ini, one contained in CMakeLists.txt have CMakeLists.txt simply reuse what is in tox.ini. Now, the python programmer who runs `tox r` should not be surprised if something goes awry during `make check` simply because `make check` was running a different set of checks. Signed-off-by: John Mulligan --- diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt index 0b706c74edb2..b2a8ac9a325d 100644 --- a/src/pybind/mgr/CMakeLists.txt +++ b/src/pybind/mgr/CMakeLists.txt @@ -13,7 +13,7 @@ if(WITH_MGR_ROOK_CLIENT) endif() if(WITH_TESTS) include(AddCephTest) - add_tox_test(mgr ${CMAKE_CURRENT_SOURCE_DIR} TOX_ENVS py3 py37 mypy flake8 jinjalint nooptional) + add_tox_test(mgr ${CMAKE_CURRENT_SOURCE_DIR} TOX_ENVS __tox_defaults__) endif() # Location needs to match default setting for mgr_module_path, currently: