From bfd909396dff632b4cc965adce0ba90c583ea022 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 18 Dec 2022 20:18:44 +0800 Subject: [PATCH] pybind/mgr/tox.ini: add commas in "modules" variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit since tox v4.0.13, it parses the variables differently, so the newlines in a variable are passed right to the command referencing it. so we now have failure like: ``` flake8: commands[0] /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr> flake8 --config=tox.ini alerts flake8: commands[1] /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr> balancer flake8: exit 2 (0.00 seconds) /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr> balancer flake8: FAIL ✖ in 3.33 seconds ``` so we have to add comma as line continuation separator to address this problem. Signed-off-by: Kefu Chai (cherry picked from commit 0cc649f029d40555e1d059e3de3739be7b9ae197) Conflicts: src/pybind/mgr/tox.ini pacific has different modules in flake8's tox file which conflicted with the main branch. --- src/pybind/mgr/tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini index d70927b0d6e4b..c97992113d542 100644 --- a/src/pybind/mgr/tox.ini +++ b/src/pybind/mgr/tox.ini @@ -122,10 +122,10 @@ deps = flake8 allowlist_externals = bash modules = - cephadm - cli_api - nfs - orchestrator + cephadm \ + cli_api \ + nfs \ + orchestrator \ prometheus commands = flake8 --config=tox.ini {posargs} \ -- 2.39.5