pybind/mgr/dashboard: move pytest into requirements.txt

before this change, pytest is included by both requirements-lint.txt
and requirements-test.txt. this fails the install-deps.sh script when
collecting the python package wheels:

ERROR: Double requirement given: pytest<4 (from -r requirements-test.txt (line 2)) (already in pytest (from -r requirements-lint.txt (line 12)), name='pytest')

also, since pytest is unconditionally imported in the source, for instance,
in pybind/mgr/dashboard/tests/test_ceph_service.py

it would be more straightforward just to include it in requirements.txt.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt
index 917547b9095535a009c22289953611de9b4b8306..e7b65eefe71a7048b12192c3f822b6e59d5f4994 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements-lint.txt
+++ b/src/pybind/mgr/dashboard/requirements-lint.txt
@@ -8,4 +8,3 @@ rstcheck==3.3.1
 autopep8
 pyfakefs
 isort==5.5.3
-pytest

diff --git a/src/pybind/mgr/dashboard/requirements-test.txt b/src/pybind/mgr/dashboard/requirements-test.txt
index 25b205ce883dd43bc37247bb4186a79f925886d7..90cd7f2b121f262162176abce33517dddb3c3fb9 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements-test.txt
+++ b/src/pybind/mgr/dashboard/requirements-test.txt
@@ -1,4 +1,3 @@
-pytest
 pytest-cov
 pytest-instafail
 pyfakefs

diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index 39ce5f9eae32f8af7bccc9017aefbb0dd88e3ff7..3aa1054dbe89767c419f61d21598509919e1be3c 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -7,4 +7,5 @@ requests
 Routes
 -e ../../../python-common
 prettytable
+pytest
 pyyaml