commit fa29ddd7bf92dd9d719de581fa936765d55e7086
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 12 17:25:33 2017 +0100
- using catchlog fixes some issues, but python3 tests hang now
python-pytest-cov.spec | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/python-pytest-cov.spec b/python-pytest-cov.spec
index 6146afb..2c5cfbe 100644
--- a/python-pytest-cov.spec
+++ b/python-pytest-cov.spec
@@ -1,9 +1,10 @@
#
# Conditional build:
-%bcond_without doc # Sphinx documentation
-%bcond_with tests # py.test tests [require some modules sources,
sensitive to coverage and pytest output]
-%bcond_without python2 # CPython 2.x module
-%bcond_without python3 # CPython 3.x module
+%bcond_without doc # Sphinx documentation
+%bcond_with tests # py.test tests [sensitive to coverage and
pytest output, hang for me]
+%bcond_with tests_py2 # Python 2 py.test tests [require some modules
sources + the above]
+%bcond_without python2 # CPython 2.x module
+%bcond_without python3 # CPython 3.x module
Summary: pytest plugin for measuring coverage
Summary(pl.UTF-8): Wtyczka pytest do mierzenia pokrycia
@@ -19,12 +20,12 @@ URL: https://github.com/pytest-dev/pytest-cov
%if %{with python2}
BuildRequires: python-modules >= 1:2.6
BuildRequires: python-setuptools
-%if %{with tests}
+%if %{with tests_py2}
BuildRequires: python-coverage >= 3.7.1
BuildRequires: python-helper
BuildRequires: python-process_tests >= 1.2.0
BuildRequires: python-pytest >= 2.6.0
-BuildRequires: python-pytest-capturelog
+BuildRequires: python-pytest-catchlog
BuildRequires: python-pytest-xdist >= 1.15.0
BuildRequires: python-virtualenv
%endif
@@ -37,7 +38,7 @@ BuildRequires: python3-coverage >= 3.7.1
BuildRequires: python3-helper
BuildRequires: python3-process_tests >= 1.2.0
BuildRequires: python3-pytest >= 2.6.0
-BuildRequires: python3-pytest-capturelog
+BuildRequires: python3-pytest-catchlog
BuildRequires: python3-pytest-xdist >= 1.15.0
BuildRequires: python3-virtualenv
%endif
@@ -96,7 +97,7 @@ Dokumentacja do moduĊu pytest-cov.
%if %{with python2}
%py_build
-%if %{with tests}
+%if %{with tests_py2}
PYTHONPATH=$(pwd)/build-2/lib PYTEST_PLUGINS=pytest_cov.plugin %{__python} -m
pytest
%endif
%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-pytest-cov.git/commitdiff/fa29ddd7bf92dd9d719de581fa936765d55e7086
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
