From: Sebastian Wagner <sewagner@redhat.com>
Date: Mon, 6 Sep 2021 09:58:49 +0000 (+0200)
Subject: pybind/mgr: tox.ini: norecursedirs instead explicitly list modules
X-Git-Tag: v17.1.0~946^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a62955aeb585d4f040856a1c8487a87057c471f;p=ceph.git

pybind/mgr: tox.ini: norecursedirs instead explicitly list modules

Simplify things by not listing all modules individually.

Also: Fixed two new doctests
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
---

diff --git a/src/pybind/mgr/diskprediction_local/predictor.py b/src/pybind/mgr/diskprediction_local/predictor.py
index fbf8d871c19..3bbe7a4b7f2 100644
--- a/src/pybind/mgr/diskprediction_local/predictor.py
+++ b/src/pybind/mgr/diskprediction_local/predictor.py
@@ -15,11 +15,12 @@ It will return a string to indicate disk failure status: "Good", "Warning",
 
 An example code is as follows:
 
->>> model = disk_failure_predictor.RHDiskFailurePredictor()
->>> status = model.initialize("./models")
->>> if status:
->>>     model.predict(disk_days)
-'Bad'
+>>> model = RHDiskFailurePredictor()
+>>> model.initialize(get_diskfailurepredictor_path() + "/models/redhat")
+>>> vendor = list(RHDiskFailurePredictor.MANUFACTURER_MODELNAME_PREFIXES.keys())[0]
+>>> disk_days = [{'vendor': vendor}]
+>>> model.predict(disk_days)
+'Unknown'
 """
 import os
 import json
@@ -170,12 +171,12 @@ class RHDiskFailurePredictor(Predictor):
         dataset_size = disk_days_attrs.shape[0] - roll_window_size + 1
         gen = (disk_days_attrs[i: i + roll_window_size, ...].mean(axis=0)
                for i in range(dataset_size))
-        means = np.vstack(gen)
+        means = np.vstack(gen)  # type: ignore
 
         # rolling stds generator
         gen = (disk_days_attrs[i: i + roll_window_size, ...].std(axis=0, ddof=1)
                for i in range(dataset_size))
-        stds = np.vstack(gen)
+        stds = np.vstack(gen)  # type: ignore
 
         # coefficient of variation
         cvs = stds / means
diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 5a482f90d0b..701462c38cd 100644
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -511,11 +511,11 @@ class Command(dict):
     handler callable.
 
     Usage:
+    >>> def handler(): return 0, "", ""
     >>> Command(prefix="example",
-    ...         args="name=arg,type=CephInt",
-    ...         perm='w',
-    ...         desc="Blah")
-    {'poll': False, 'cmd': 'example name=arg,type=CephInt', 'perm': 'w', 'desc': 'Blah'}
+    ...         handler=handler,
+    ...         perm='w')
+    {'perm': 'w', 'poll': False}
     """
 
     def __init__(
diff --git a/src/pybind/mgr/requirements.txt b/src/pybind/mgr/requirements.txt
index 27e791f6c93..9b315e4562a 100644
--- a/src/pybind/mgr/requirements.txt
+++ b/src/pybind/mgr/requirements.txt
@@ -9,3 +9,9 @@ Jinja2
 pyfakefs
 asyncssh
 asyncmock
+
+jsonpatch
+pecan
+scipy
+cherrypy
+werkzeug
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 9709d8edd32..0165f77ddbe 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -11,6 +11,7 @@ requires = cython
 
 [pytest]
 log_level=NOTSET
+norecursedirs = dashboard rook/rook_client rook/rook-client-python
 
 [flake8]
 max-line-length = 100
@@ -42,17 +43,7 @@ deps =
     cython
     -rrequirements.txt
 commands =
-    pytest --doctest-modules {posargs: \
-        mgr_util.py \
-        tests/ \
-        cephadm/ \
-        mds_autoscaler/ \
-        nfs/ \
-        orchestrator/ \
-        insights/ \
-        pg_autoscaler/ \
-        progress/ \
-        snap_schedule}
+    pytest --doctest-modules {posargs:}
 
 [testenv:mypy]
 setenv =