commit 0537ae48a120afb521cdfe9274a77965fa7427cb
Author: Jakub Bogusz <[email protected]>
Date: Sat Jul 21 19:44:49 2018 +0200
- more modules that cause tests to fail
python-pytest.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/python-pytest.spec b/python-pytest.spec
index 34cb6ac..e5fd294 100644
--- a/python-pytest.spec
+++ b/python-pytest.spec
@@ -36,6 +36,7 @@ BuildRequires: python-nose
BuildRequires: python-pluggy >= 0.5
BuildRequires: python-requests
BuildRequires: python-six >= 1.10.0
+BuildConflicts: python-backports.unittest_mock
BuildConflicts: python-pytest-catchlog
# with xdist requires various modules source
BuildConflicts: python-pytest-xdist
@@ -57,6 +58,7 @@ BuildRequires: python3-pluggy >= 0.5
BuildRequires: python3-requests
BuildRequires: python3-six >= 1.10.0
BuildConflicts: python3-pytest-catchlog
+BuildConflicts: python3-pytest-xdist
%endif
%endif
BuildRequires: rpm-pythonprov
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-pytest.git/commitdiff/0537ae48a120afb521cdfe9274a77965fa7427cb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
