From eab195566d54122f826debd8efb7f36db78fa4e1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 1 Apr 2021 11:05:19 +0800 Subject: [PATCH] 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 --- src/pybind/mgr/dashboard/requirements-lint.txt | 1 - src/pybind/mgr/dashboard/requirements-test.txt | 1 - src/pybind/mgr/dashboard/requirements.txt | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt index 917547b9095..e7b65eefe71 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 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 25b205ce883..90cd7f2b121 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 diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt index 39ce5f9eae3..3aa1054dbe8 100644 --- 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 -- 2.39.5