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>
(cherry picked from commit eab195566d54122f826debd8efb7f36db78fa4e1)

 Conflicts:
	src/pybind/mgr/dashboard/requirements-lint.txt: Additional
        package lines
	src/pybind/mgr/dashboard/requirements-test.txt: No mock line

diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt
index cc646e97979deee1875bbbabdc1e54a14e075561..3eb103787f403c5e00b86b5bd6ae841e42c66b8a 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements-lint.txt
+++ b/src/pybind/mgr/dashboard/requirements-lint.txt
@@ -9,4 +9,3 @@ flake8-colors==0.1.6; python_version >= '3'
 rstcheck==3.3.1; python_version >= '3'
 autopep8; python_version >= '3'
 pyfakefs; python_version >= '3'
-pytest

diff --git a/src/pybind/mgr/dashboard/requirements-test.txt b/src/pybind/mgr/dashboard/requirements-test.txt
index f9655a128e7ae679bba4da3b95a6829bbeb7fecc..f232317a5b25e1bb9a413ac848b910561e882b69 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements-test.txt
+++ b/src/pybind/mgr/dashboard/requirements-test.txt
@@ -1,5 +1,4 @@
 mock; python_version <= '3.3'
-pytest
 pytest-cov
 pytest-instafail
 pyfakefs

diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index 1b8ce514329f0d1656fea27710b0711cb6fd25eb..258e34261b18a25a44e4e306d2d2a44d25a00505 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -10,4 +10,5 @@ Routes
 six
 -e ../../../python-common
 prettytable
+pytest
 pyyaml