From: Kefu Chai <kchai@redhat.com>
Date: Thu, 1 Apr 2021 03:05:19 +0000 (+0800)
Subject: pybind/mgr/dashboard: move pytest into requirements.txt
X-Git-Tag: v16.2.11~251^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afb1cfed304de0bc814fbeeb3d6d9f29f7712de9;p=ceph.git

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: Remove pytest==6.2.4 as pytest
                                                        moved to requirements.txt
---

diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt
index be4c91a04dd..1b15f46817c 100644
--- 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==1.5.7
 pyfakefs==4.5.0
 isort==5.5.3
-pytest==6.2.4
diff --git a/src/pybind/mgr/dashboard/requirements-test.txt b/src/pybind/mgr/dashboard/requirements-test.txt
index 8ff94356662..625f5c358f1 100644
--- 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==4.5.0
diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index fd5a2efaeed..84dee7efc9a 100644
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -7,5 +7,6 @@ requests
 Routes
 -e ../../../python-common
 prettytable
+pytest
 pyyaml
 setuptools