From: Kefu Chai <kchai@redhat.com>
Date: Tue, 13 Oct 2020 08:09:42 +0000 (+0800)
Subject: pybind/mgr/dashboard: s/pytest<4/pytest/
X-Git-Tag: v15.2.13~20^2~1^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df552ba1f42764c5c9e2f69a8fed6ba349358714;p=ceph.git

pybind/mgr/dashboard: s/pytest<4/pytest/

to address following failure:

    The user requested pytest<4
    pytest-cov 2.10.1 depends on pytest>=4.6

when building the target of "mgr-dashboard-virtualenv"

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 128778f25eb64cd334e062d627abdb23e0ef0e49)

 Conflicts:
	src/pybind/mgr/dashboard/requirements-test.txt: No mock line
---

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