From: Jan Fajerski <jfajerski@suse.com>
Date: Wed, 18 Dec 2019 10:35:40 +0000 (+0100)
Subject: pybind/mgr: tox.ini include cython bindings.
X-Git-Tag: v15.2.2~80^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe188b71025b3418d095b36ddd77b97e182b625b;p=ceph.git

pybind/mgr: tox.ini include cython bindings.

(cherry picked from commit a44de38b61d598fb0512ea48da0de4179d39b804)

Conflicts:
	src/pybind/mgr/tox.ini

The rest of this commit was not picked:

> mgr_util: add CephfsClient implementation
>
> This pulls parts of the VolumesClient implementation into mgr_util to
> make the CephFS specific pieces available to other mgr modules. To
> reduce code duplication the VolumeClient now extends the CephfsClient
> class to add the volume specific methods.

> Signed-off-by: Jan Fajerski <jfajerski@suse.com>
---

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index e5222ef6360..10694f05995 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -1,15 +1,22 @@
 [tox]
 envlist = py3, mypy
 skipsdist = true
+requires = cython
 
 [testenv]
-setenv = UNITTEST = true
-deps = -r requirements.txt
+setenv =
+    UNITTEST = true
+    PYTHONPATH = ../../../build/lib/cython_modules/lib.3/
+    LD_LIBRARY_PATH = ../../../build/lib
+deps =
+    cython
+    -r requirements.txt
 commands = pytest -v --cov --cov-append --cov-report= --doctest-modules {posargs:mgr_util.py tests/ cephadm/ pg_autoscaler/ progress/}
 
 [testenv:mypy]
 basepython = python3
 deps =
+    cython
     -r requirements.txt
     mypy==0.770
 commands = mypy --config-file=../../mypy.ini \