Hello community,
here is the log from the commit of package python-pytest-timeout for
openSUSE:Factory checked in at 2019-02-13 10:07:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-timeout (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-timeout.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-timeout"
Wed Feb 13 10:07:38 2019 rev:7 rq:674165 version:1.3.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-timeout/python-pytest-timeout.changes
2018-11-22 13:26:58.813908795 +0100
+++
/work/SRC/openSUSE:Factory/.python-pytest-timeout.new.28833/python-pytest-timeout.changes
2019-02-13 10:07:49.809524150 +0100
@@ -1,0 +2,6 @@
+Tue Feb 12 15:43:02 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Fix build with pytest4 from upstream:
+ * pytest4.patch
+
+-------------------------------------------------------------------
New:
----
pytest4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-timeout.spec ++++++
--- /var/tmp/diff_new_pack.YWaKQc/_old 2019-02-13 10:07:51.109523820 +0100
+++ /var/tmp/diff_new_pack.YWaKQc/_new 2019-02-13 10:07:51.109523820 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-pytest-timeout
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without test
Name: python-pytest-timeout
Version: 1.3.3
Release: 0
@@ -26,17 +25,16 @@
Group: Development/Languages/Python
URL: http://bitbucket.org/pytest-dev/pytest-timeout/
Source:
https://files.pythonhosted.org/packages/source/p/pytest-timeout/pytest-timeout-%{version}.tar.gz
+Patch0: pytest4.patch
BuildRequires: %{python_module devel}
+BuildRequires: %{python_module pexpect}
+BuildRequires: %{python_module pytest >= 3.6.0}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-pexpect
Requires: python-pytest >= 3.6.0
BuildArch: noarch
-%if %{with test}
-BuildRequires: %{python_module pexpect}
-BuildRequires: %{python_module pytest >= 3.6.0}
-%endif
%python_subpackages
%description
@@ -58,6 +56,7 @@
%prep
%setup -q -n pytest-timeout-%{version}
+%patch0 -p1
%build
%python_build
@@ -66,17 +65,9 @@
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
-%if %{with test}
%check
-mkdir tester
-pushd tester
-ln -s ../test_pytest_timeout.py .
-%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
-$python -B -m pytest test_pytest_timeout.py
-rm %{buildroot}%{$python_sitelib}/__pycache__/pytest_timeout*-PYTEST.py*
-}
-popd
-%endif
+export PYTHONDONTWRITEBYTECODE=1
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m pytest
test_pytest_timeout.py
%files %{python_files}
%license LICENSE
++++++ pytest4.patch ++++++
# HG changeset patch
# User Bruno Oliveira <[email protected]>
# Date 1542370558 7200
# Node ID 36998c891573d8ec1db1acd4f9438cb3cf2aee2e
# Parent 753c5f39d2a8d1477ea8653ca7c7bdbdca1efafc
Change tests to use pytest.param
diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
--- a/test_pytest_timeout.py
+++ b/test_pytest_timeout.py
@@ -93,7 +93,7 @@
# assert 'Timeout' in result.stdout.str() + result.stderr.str()
[email protected]('meth', [have_sigalrm('signal'), 'thread'])
[email protected]('meth', [pytest.param('signal', marks=have_sigalrm),
'thread'])
@pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
def test_fix_setup(meth, scope, testdir):
testdir.makepyfile("""
@@ -133,7 +133,7 @@
assert 'Timeout' not in result.stdout.str() + result.stderr.str()
[email protected]('meth', [have_sigalrm('signal'), 'thread'])
[email protected]('meth', [pytest.param('signal', marks=have_sigalrm),
'thread'])
@pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
def test_fix_finalizer(meth, scope, testdir):
testdir.makepyfile("""