From c67106b120c0289f0c26d2f89892e8954b3b57bd Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 9 Dec 2022 00:49:37 +0800
Subject: [PATCH] pybind/mgr: do not test with py37

as we always test with ubuntu jammy, which does not provide python3.7:

py37: skipped because could not find python interpreter with spec(s): py37

so there is no point testing with python3.7.

also, in tox v4, it is not able to handle "key = value" anymore, where
value has newlines in it. so we need to find a better way passing
command line options to the test command.

this change partially reverts 2dd86c9e3eca6e14a04a821edf3a654f31da7a21

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
 src/pybind/mgr/tox.ini | 68 ++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index b01fee447e7..32f4a48bac4 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
     py3,
-    py37,
     mypy,
     fix
     flake8
@@ -71,38 +70,6 @@ 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
@@ -114,9 +81,38 @@ deps =
     types-PyYAML
     types-jwt
 commands =
-    mypy {[testenv:mypy]mypy_args}
-    mypy --python-version 3.7 {[testenv:mypy]mypy_args}
-
+    mypy --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
 
 [testenv:test]
 setenv = {[testenv]setenv}