commit bc624dc465bcc49f69bc58fafe888f738e95eecc
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 12 15:48:05 2017 +0100
- py3 tests now have chances to pass
python-pytest-xdist.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/python-pytest-xdist.spec b/python-pytest-xdist.spec
index 6113e0d..126cce2 100644
--- a/python-pytest-xdist.spec
+++ b/python-pytest-xdist.spec
@@ -1,8 +1,9 @@
#
# Conditional build:
-%bcond_without python2 # CPython 2.x module
-%bcond_without python3 # CPython 3.x module
-%bcond_with tests # tests [requiring source code of some modules,
sensitive to pytest warnings or other output changes]
+%bcond_without python2 # CPython 2.x module
+%bcond_without python3 # CPython 3.x module
+%bcond_without tests # tests [sensitive to pytest warnings or other
output changes]
+%bcond_with tests_py2 # tests with Python 2 [requiring source code of
some modules + the above]
Summary: py.test distributed testing plugin
Summary(pl.UTF-8): Wtyczka py.test do testów rozproszonych
@@ -20,11 +21,12 @@ URL:
https://github.com/pytest-dev/pytest-xdist
BuildRequires: python-modules >= 1:2.6
BuildRequires: python-setuptools
BuildRequires: python-setuptools_scm
-%if %{with tests}
+%if %{with tests_py2}
BuildRequires: python-execnet >= 1.1
BuildRequires: python-pexpect >= 3
BuildRequires: python-py >= 1.4.22
BuildRequires: python-pytest >= 2.4.2
+BuildConflicts: python-pytest-capturelog
%endif
%endif
%if %{with python3}
@@ -36,6 +38,7 @@ BuildRequires: python3-execnet >= 1.1
BuildRequires: python3-pexpect >= 3
BuildRequires: python3-py >= 1.4.22
BuildRequires: python3-pytest >= 2.4.2
+BuildConflicts: python-pytest-capturelog
%endif
%endif
BuildRequires: rpm-pythonprov
@@ -74,7 +77,7 @@ trybów wykonywania testów, jak choćby zrównoleglenie.
%if %{with python2}
%py_build
-%if %{with tests}
+%if %{with tests_py2}
PYTHONPATH=$(pwd) %{__python} -m pytest testing
%endif
%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-pytest-xdist.git/commitdiff/bc624dc465bcc49f69bc58fafe888f738e95eecc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
