diff --git a/.gitignore b/.gitignore index 2bb3682..adcf957 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pytest-timeout-1.4.2.tar.gz +pytest-timeout-2.2.0.tar.gz diff --git a/.python-pytest-timeout.metadata b/.python-pytest-timeout.metadata deleted file mode 100644 index 0e47f2a..0000000 --- a/.python-pytest-timeout.metadata +++ /dev/null @@ -1 +0,0 @@ -56df6d5116a97976f2cfb896b13708999c614332 SOURCES/pytest-timeout-1.4.2.tar.gz diff --git a/SOURCES/0001-Remove-test-only-dependency-pexpect.patch b/SOURCES/0001-Remove-test-only-dependency-pexpect.patch deleted file mode 100644 index 592716d..0000000 --- a/SOURCES/0001-Remove-test-only-dependency-pexpect.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 787944c580596237b732e227075e9e9e257681a6 Mon Sep 17 00:00:00 2001 -From: Tomas Orsava -Date: Tue, 15 Jun 2021 11:15:19 +0200 -Subject: [PATCH] Remove test-only dependency pexpect - ---- - test_pytest_timeout.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py -index 16302d7..fe0dd05 100644 ---- a/test_pytest_timeout.py -+++ b/test_pytest_timeout.py -@@ -3,7 +3,10 @@ import signal - import sys - import time - --import pexpect -+try: -+ import pexpect -+except ImportError: -+ pexpect = None # does not have spawn :) - import pytest - - pytest_plugins = "pytester" --- -2.31.1 - diff --git a/SPECS/python-pytest-timeout.spec b/python-pytest-timeout.spec similarity index 64% rename from SPECS/python-pytest-timeout.spec rename to python-pytest-timeout.spec index 26bca0b..1c936e9 100644 --- a/SPECS/python-pytest-timeout.spec +++ b/python-pytest-timeout.spec @@ -1,23 +1,19 @@ %global pypi_name pytest-timeout Name: python-%{pypi_name} -Version: 1.4.2 -Release: 7%{?dist} +Version: 2.2.0 +Release: 5%{?dist} Summary: py.test plugin to abort hanging tests +# SPDX License: MIT URL: https://github.com/pytest-dev/pytest-timeout Source0: %{pypi_source} -# This patch skips 3 tests out of 38 because of missing dependency -# python-pexpect in RHEL 9 -Patch1: 0001-Remove-test-only-dependency-pexpect.patch - BuildArch: noarch BuildRequires: python3-devel -BuildRequires: %{py3_dist pytest} >= 3.6.0 -BuildRequires: %{py3_dist setuptools} +BuildRequires: %{py3_dist pexpect} %global _description %{expand: This is a plugin which will terminate tests after a certain timeout. When doing @@ -36,14 +32,17 @@ Summary: %{summary} %prep %autosetup -p1 -n %{pypi_name}-%{version} +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install %check -%pytest -k "not test_cov" +%pytest %files -n python3-%{pypi_name} @@ -53,19 +52,61 @@ Summary: %{summary} %{python3_sitelib}/__pycache__/pytest_timeout* %changelog -* Tue Aug 10 2021 Mohan Boddu - 1.4.2-7 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Tue Oct 29 2024 Troy Dawson - 2.2.0-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Tue Jun 15 2021 Tomas Orsava - 1.4.2-6 -- Remove test-dependency on python-pexpect +* Mon Jun 24 2024 Troy Dawson - 2.2.0-4 +- Bump release for June 2024 mass rebuild -* Fri Apr 16 2021 Mohan Boddu - 1.4.2-5 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Fri Jan 26 2024 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Tue Mar 30 2021 Miro Hrončok - 1.4.2-4 -- Don't BuildRequire python3-pytest-cov -Resolves: rhbz#1945252 +* Mon Jan 22 2024 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 09 2023 Scott Talbert - 2.2.0-1 +- Update to new upstream release 2.2.0 (#2242718) +- Modernize Python packaging + +* Tue Aug 08 2023 Karolina Surma - 2.1.0-7 +- Declare license as an SPDX expression + +* Fri Jul 21 2023 Fedora Release Engineering - 2.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 2.1.0-5 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 2.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 2.1.0-2 +- Rebuilt for Python 3.11 + +* Sat Jan 22 2022 Scott Talbert - 2.1.0-1 +- Update to new upstream release 2.1.0 (#2042161) + +* Fri Jan 21 2022 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Scott Talbert - 2.0.2-1 +- Update to new upstream release 2.0.2 (#2032002) + +* Mon Oct 11 2021 Scott Talbert - 2.0.1-1 +- Update to new upstream release 2.0.1 (#2013023) + +* Mon Oct 11 2021 Scott Talbert - 2.0.0-1 +- Update to new upstream release 2.0.0 (#2012634) + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 03 2021 Python Maint - 1.4.2-4 +- Rebuilt for Python 3.10 * Wed Jan 27 2021 Fedora Release Engineering - 1.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..6a4bc18 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (pytest-timeout-2.2.0.tar.gz) = 11a0c4e958b324bff3e149bf2a7dc5bf6ab6549405d5061856f8f1ad0e43df1cddce83df4c804b717276bfbcfcf60ee6b400625d0f4e4e73c98785146c22164f