diff --git a/pytest-timeout-1.3.3.tar.gz b/pytest-timeout-1.3.3.tar.gz deleted file mode 100644 index 764a093..0000000 --- a/pytest-timeout-1.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a30ba76837a32c7b7cd5c84ee9933fde4b9022b0cd20ea7d4a577c2a1649fb1 -size 11627 diff --git a/pytest-timeout-1.3.4.tar.gz b/pytest-timeout-1.3.4.tar.gz new file mode 100644 index 0000000..115055f --- /dev/null +++ b/pytest-timeout-1.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80faa19cd245a42b87a51699d640c00d937c02b749052bfca6bae8bdbe12c48e +size 12255 diff --git a/pytest4.patch b/pytest4.patch deleted file mode 100644 index 143643c..0000000 --- a/pytest4.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User Bruno Oliveira -# 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() - - --@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread']) -+@pytest.mark.parametrize('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() - - --@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread']) -+@pytest.mark.parametrize('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(""" diff --git a/python-pytest-timeout.changes b/python-pytest-timeout.changes index 8f2fa9a..66ea3ad 100644 --- a/python-pytest-timeout.changes +++ b/python-pytest-timeout.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 9 08:24:34 UTC 2020 - Tomáš Chvátal + +- Update to 1.3.4: + * upstream moved to github + * support newer pytest releases +- Drop merged patch pytest4.patch + ------------------------------------------------------------------- Tue Feb 12 15:43:02 UTC 2019 - Tomáš Chvátal diff --git a/python-pytest-timeout.spec b/python-pytest-timeout.spec index bbfed3a..bf63d87 100644 --- a/python-pytest-timeout.spec +++ b/python-pytest-timeout.spec @@ -1,7 +1,7 @@ # # spec file for package python-pytest-timeout # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytest-timeout -Version: 1.3.3 +Version: 1.3.4 Release: 0 Summary: Pytest plugin to abort hanging tests License: MIT -Group: Development/Languages/Python -URL: http://bitbucket.org/pytest-dev/pytest-timeout/ +URL: https://github.com/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} @@ -56,7 +53,6 @@ side-effects. %prep %setup -q -n pytest-timeout-%{version} -%patch0 -p1 %build %python_build @@ -67,11 +63,11 @@ side-effects. %check export PYTHONDONTWRITEBYTECODE=1 -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m pytest test_pytest_timeout.py +%pytest %files %{python_files} %license LICENSE -%doc README +%doc README.rst %{python_sitelib}/pytest_timeout-%{version}-py*.egg-info %{python_sitelib}/pytest_timeout.py* %pycache_only %{python_sitelib}/__pycache__/pytest_timeout*.py*