diff --git a/pyopenssl-25-1-compatibility.patch b/pyopenssl-25-1-compatibility.patch new file mode 100644 index 0000000..113cc94 --- /dev/null +++ b/pyopenssl-25-1-compatibility.patch @@ -0,0 +1,32 @@ +From c6e15249dc0cfe29bdbe6829ae4a3891aa147aa3 Mon Sep 17 00:00:00 2001 +From: A5rocks +Date: Fri, 20 Jun 2025 10:13:37 -0400 +Subject: [PATCH] Move away from RaisesContext + +--- + src/trio/_tests/test_testing_raisesgroup.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/trio/_tests/test_testing_raisesgroup.py b/src/trio/_tests/test_testing_raisesgroup.py +index b3fe2ae755..a42566d3ec 100644 +--- a/src/trio/_tests/test_testing_raisesgroup.py ++++ b/src/trio/_tests/test_testing_raisesgroup.py +@@ -14,9 +14,6 @@ + if sys.version_info < (3, 11): + from exceptiongroup import BaseExceptionGroup, ExceptionGroup + +-if TYPE_CHECKING: +- from _pytest.python_api import RaisesContext +- + + def wrap_escape(s: str) -> str: + return "^" + re.escape(s) + "$" +@@ -24,7 +21,7 @@ def wrap_escape(s: str) -> str: + + def fails_raises_group( + msg: str, add_prefix: bool = True +-) -> RaisesContext[AssertionError]: ++) -> pytest.RaisesExc[AssertionError]: + assert ( + msg[-1] != "\n" + ), "developer error, expected string should not end with newline" diff --git a/python-trio.changes b/python-trio.changes index bb9057a..add5955 100644 --- a/python-trio.changes +++ b/python-trio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 17 20:26:22 UTC 2025 - Dirk Müller + +- add pyopenssl-25-1-compatibility.patch to ignore deprecation + warnings (from pyopenssl) + ------------------------------------------------------------------- Wed Jul 2 11:20:53 UTC 2025 - John Paul Adrian Glaubitz diff --git a/python-trio.spec b/python-trio.spec index fe8f266..15558a1 100644 --- a/python-trio.spec +++ b/python-trio.spec @@ -32,6 +32,7 @@ Summary: Python async/await-native I/O library License: Apache-2.0 OR MIT URL: https://github.com/python-trio/trio Source: https://files.pythonhosted.org/packages/source/t/trio/trio-%{version}.tar.gz +Patch1: https://github.com/python-trio/trio/pull/3292/commits/c6e15249dc0cfe29bdbe6829ae4a3891aa147aa3.patch#/pyopenssl-25-1-compatibility.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools > 77} @@ -84,6 +85,7 @@ sed -i '/\/usr\/bin\/env\ python3/d' src/trio/_tests/check_type_completeness.py %check %if %{with test} +export PYTEST_ADDOPTS="-W ignore::DeprecationWarning" # test_static_tool_sees_all_symbols uses jedi/pylint for static analysis, # pointless for us. donttest="test_static_tool_sees_all_symbols"