public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Scott Talbert <swt@techie.net>
To: git-commits@fedoraproject.org
Subject: [rpms/python-pytest-timeout] rawhide: Revert timeout option change from str to float
Date: Mon, 24 Aug 2026 23:21:19 GMT [thread overview]
Message-ID: <178761367967.1.1367406461835475971.rpms-python-pytest-timeout-ab3886bd183f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/python-pytest-timeout
Branch : rawhide
Commit : ab3886bd183f646b0d9258d094080063f1a95edd
Author : Scott Talbert <swt@techie.net>
Date : 2026-08-24T19:21:11-04:00
Stats : +78/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/python-pytest-timeout/c/ab3886bd183f646b0d9258d094080063f1a95edd?branch=rawhide
Log:
Revert timeout option change from str to float
---
diff --git a/python-pytest-timeout.spec b/python-pytest-timeout.spec
index e3853e4..44591ae 100644
--- a/python-pytest-timeout.spec
+++ b/python-pytest-timeout.spec
@@ -2,13 +2,14 @@
Name: python-pytest-timeout
Version: 2.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: py.test plugin to abort hanging tests
# SPDX
License: MIT
URL: https://github.com/pytest-dev/pytest-timeout
Source0: %{pypi_source}
+Patch: revert-str-to-float-timeout-option.patch
BuildArch: noarch
@@ -50,6 +51,9 @@ sed -i -e '/\s*ipdb$/d' tox.ini
%doc README.rst
%changelog
+* Mon Aug 24 2026 Scott Talbert <swt@techie.net> - 2.5.0-2
+- Revert timeout option change from str to float
+
* Sun Aug 16 2026 Scott Talbert <swt@techie.net> - 2.5.0-1
- Update to new upstream release 2.5.0 (#2517247)
diff --git a/revert-str-to-float-timeout-option.patch b/revert-str-to-float-timeout-option.patch
new file mode 100644
index 0000000..f8c1039
--- /dev/null
+++ b/revert-str-to-float-timeout-option.patch
@@ -0,0 +1,73 @@
+From db119c86dfe6f608307b87cc40890191733bee3e Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Mon, 24 Aug 2026 19:14:58 -0400
+Subject: [PATCH] Revert "declare timeout ini options as float (#200)"
+
+This reverts commit cece2d6e8fa0b2b1e71e7c3444357b186963b4ed.
+---
+ pytest_timeout.py | 4 ++--
+ setup.cfg | 2 +-
+ test_pytest_timeout.py | 25 -------------------------
+ 3 files changed, 3 insertions(+), 28 deletions(-)
+
+diff --git a/pytest_timeout.py b/pytest_timeout.py
+index 192a16c..29f2a57 100644
+--- a/pytest_timeout.py
++++ b/pytest_timeout.py
+@@ -94,7 +94,7 @@ def pytest_addoption(parser):
+ metavar="SECONDS",
+ help=SESSION_TIMEOUT_DESC,
+ )
+- parser.addini("timeout", TIMEOUT_DESC, type="float")
++ parser.addini("timeout", TIMEOUT_DESC)
+ parser.addini("timeout_method", METHOD_DESC)
+ parser.addini("timeout_func_only", FUNC_ONLY_DESC, type="bool", default=False)
+ parser.addini(
+@@ -103,7 +103,7 @@ def pytest_addoption(parser):
+ type="bool",
+ default=False,
+ )
+- parser.addini("session_timeout", SESSION_TIMEOUT_DESC, type="float")
++ parser.addini("session_timeout", SESSION_TIMEOUT_DESC)
+
+
+ class TimeoutHooks:
+diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
+index ff36c40..2aabbd1 100644
+--- a/test_pytest_timeout.py
++++ b/test_pytest_timeout.py
+@@ -347,31 +347,6 @@ def test_ini_timeout(pytester):
+ assert result.ret
+
+
+-@pytest.mark.skipif(
+- pytest.version_tuple < (9, 0),
+- reason="native [tool.pytest] table requires pytest 9",
+-)
+-def test_pyproject_toml_int_timeout(pytester):
+- pytester.makepyfile(
+- """
+- import time
+-
+- def test_foo():
+- time.sleep(2)
+- """
+- )
+- pytester.makepyprojecttoml(
+- """
+- [tool.pytest]
+- timeout = 1
+- session_timeout = 60
+- """
+- )
+- result = pytester.runpytest_subprocess()
+- result.stdout.no_fnmatch_line("INTERNALERROR*")
+- assert result.ret
+-
+-
+ def test_ini_timeout_func_only(pytester):
+ pytester.makepyfile(
+ """
+--
+2.55.0
+
reply other threads:[~2026-08-24 23:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178761367967.1.1367406461835475971.rpms-python-pytest-timeout-ab3886bd183f@fedoraproject.org \
--to=swt@techie.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox