]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/dashboard: s/pytest<4/pytest/
authorKefu Chai <kchai@redhat.com>
Tue, 13 Oct 2020 08:09:42 +0000 (16:09 +0800)
committerBrad Hubbard <bhubbard@redhat.com>
Wed, 12 May 2021 22:58:30 +0000 (08:58 +1000)
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

src/pybind/mgr/dashboard/requirements-test.txt

index 9305006176ea8409687474f5e0e601ac4dca0493..f9655a128e7ae679bba4da3b95a6829bbeb7fecc 100644 (file)
@@ -1,5 +1,5 @@
 mock; python_version <= '3.3'
-pytest<4
+pytest
 pytest-cov
 pytest-instafail
 pyfakefs