From a24f0e35cccb4db6c3ca0659b6f353335c23697c Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 6 Jan 2020 20:24:52 -0500 Subject: [PATCH] Update to new upstream release (#1788278) --- .gitignore | 1 + pytest4.patch | 28 ---------------------------- python-pytest-timeout.spec | 14 +++++++------- sources | 2 +- 4 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 pytest4.patch diff --git a/.gitignore b/.gitignore index 3073cea..dc10c98 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /pytest-timeout-1.3.1.tar.gz /pytest-timeout-1.3.2.tar.gz /pytest-timeout-1.3.3.tar.gz +/pytest-timeout-1.3.4.tar.gz diff --git a/pytest4.patch b/pytest4.patch deleted file mode 100644 index 9f5bcd2..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.spec b/python-pytest-timeout.spec index 3ea138b..0f368a2 100644 --- a/python-pytest-timeout.spec +++ b/python-pytest-timeout.spec @@ -5,17 +5,14 @@ when running tests under a continuous integration server or simply if you don’ know why the test suite hangs. Name: python-%{pypi_name} -Version: 1.3.3 -Release: 7%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: py.test plugin to abort hanging tests License: MIT -URL: https://bitbucket.org/pytest-dev/pytest-timeout/ +URL: https://github.com/pytest-dev/pytest-timeout Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -# Support Pytest 4 -Patch1: %{url}commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw#/pytest4.patch - BuildArch: noarch BuildRequires: python3-devel @@ -47,12 +44,15 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} PYTHONDONTWRITEBYTECODE=1 py.test-%{py %files -n python3-%{pypi_name} -%doc README +%doc README.rst %license LICENSE %{python3_sitelib}/pytest_timeout* %{python3_sitelib}/__pycache__/pytest_timeout* %changelog +* Tue Jan 07 2020 Scott Talbert - 1.3.4-1 +- Update to new upstream release (#1788278) + * Thu Oct 03 2019 Miro Hrončok - 1.3.3-7 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 0462cc5..d7d24af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pytest-timeout-1.3.3.tar.gz) = 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84 +SHA512 (pytest-timeout-1.3.4.tar.gz) = 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80