From: Adam King <adking@redhat.com>
Date: Fri, 9 Dec 2022 16:10:36 +0000 (-0500)
Subject: mgr/pybind: fix mypy arg parsing
X-Git-Tag: v18.1.0~692^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e5840ff2c5815897e3eaeb136927971ad6f5384;p=ceph.git

mgr/pybind: fix mypy arg parsing

On the new tox version it is treating each line as a new command
so it will do something like "mypy --config-file=../../mypy.ini"
as one command and then "-m balancer" as a totally separate command.
The first one immediately fails as it doesn't include any modules
to test. Adding backslashes to the ends of the lines gets it to
handle the lines as one long command

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/src/pybind/mgr/requirements-required.txt b/src/pybind/mgr/requirements-required.txt
index a750b05379101..1c4bbf4710b96 100644
--- a/src/pybind/mgr/requirements-required.txt
+++ b/src/pybind/mgr/requirements-required.txt
@@ -1,4 +1,4 @@
--e../../python-common
+-e ../../python-common
 asyncmock
 cherrypy
 cryptography
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 32f4a48bac4d2..af7c9b5eebbf8 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -70,6 +70,39 @@ setenv =
 passenv =
     MYPYPATH
 basepython = python3
+mypy_args =
+           --config-file=../../mypy.ini \
+           -m alerts \
+           -m balancer \
+           -m cephadm \
+           -m crash \
+           -m dashboard \
+           -m devicehealth \
+           -m diskprediction_local \
+           -m hello \
+           -m influx \
+           -m iostat \
+           -m localpool \
+           -m mds_autoscaler \
+           -m mgr_module \
+           -m mgr_util \
+           -m mirroring \
+           -m nfs \
+           -m orchestrator \
+           -m pg_autoscaler \
+           -m progress \
+           -m prometheus \
+           -m rbd_support \
+           -m rook \
+           -m snap_schedule \
+           -m selftest \
+           -m stats \
+           -m status \
+           -m telegraf \
+           -m telemetry \
+           -m test_orchestrator \
+           -m volumes \
+           -m zabbix
 deps =
     -rrequirements.txt
     -c{toxinidir}/../../mypy-constrains.txt