forked from pool/python-PyHamcrest
Compare commits
3 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| f9befdfcfe | |||
| 45fadd27f2 | |||
| 1c12acaab2 |
107
py314.patch
Normal file
107
py314.patch
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
Index: pyhamcrest-2.1.0/tests/hamcrest_unit_test/core/future_test.py
|
||||||
|
===================================================================
|
||||||
|
--- pyhamcrest-2.1.0.orig/tests/hamcrest_unit_test/core/future_test.py
|
||||||
|
+++ pyhamcrest-2.1.0/tests/hamcrest_unit_test/core/future_test.py
|
||||||
|
@@ -41,20 +41,20 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
await resolved(raise_exception()),
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testDoesNotMatchIfActualIsNotAFuture(self):
|
||||||
|
async def test():
|
||||||
|
self.assert_does_not_match("Not a future", future_raising(TypeError), 23)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testDoesNotMatchIfFutureIsNotDone(self):
|
||||||
|
- future = asyncio.Future()
|
||||||
|
+ future = asyncio.Future(loop=asyncio.new_event_loop())
|
||||||
|
self.assert_does_not_match("Unresolved future", future_raising(TypeError), future)
|
||||||
|
|
||||||
|
def testDoesNotMatchIfFutureIsCancelled(self):
|
||||||
|
- future = asyncio.Future()
|
||||||
|
+ future = asyncio.Future(loop=asyncio.new_event_loop())
|
||||||
|
future.cancel()
|
||||||
|
self.assert_does_not_match("Cancelled future", future_raising(TypeError), future)
|
||||||
|
|
||||||
|
@@ -73,7 +73,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
expected_message, future_raising(TypeError), await resolved(raise_exception())
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
@pytest.mark.skipif(sys.version_info < (3, 7), reason="Message differs between Python versions")
|
||||||
|
def testDoesNotMatchIfFutureHasTheWrongExceptionTypePy37(self):
|
||||||
|
@@ -88,7 +88,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
expected_message, future_raising(TypeError), await resolved(raise_exception())
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testMatchesIfFutureHasASubclassOfTheExpectedException(self):
|
||||||
|
async def test():
|
||||||
|
@@ -98,7 +98,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
await resolved(raise_exception()),
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testDoesNotMatchIfFutureDoesNotHaveException(self):
|
||||||
|
async def test():
|
||||||
|
@@ -106,7 +106,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
"No exception", future_raising(ValueError), await resolved(no_exception())
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testDoesNotMatchExceptionIfRegularExpressionDoesNotMatch(self):
|
||||||
|
async def test():
|
||||||
|
@@ -121,7 +121,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
await resolved(raise_exception()),
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testMatchesRegularExpressionToStringifiedException(self):
|
||||||
|
async def test():
|
||||||
|
@@ -137,7 +137,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
await resolved(raise_exception(3, 1, 4)),
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testMachesIfExceptionMatchesAdditionalMatchers(self):
|
||||||
|
async def test():
|
||||||
|
@@ -147,7 +147,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
await resolved(raise_exception_with_properties(prip="prop")),
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testDoesNotMatchIfAdditionalMatchersDoesNotMatch(self):
|
||||||
|
async def test():
|
||||||
|
@@ -162,7 +162,7 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
await resolved(raise_exception_with_properties(prip="prop")),
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
|
|
||||||
|
def testDoesNotMatchIfNeitherPatternOrMatcherMatch(self):
|
||||||
|
async def test():
|
||||||
|
@@ -181,4 +181,4 @@ class FutureExceptionTest(MatcherTest):
|
||||||
|
await resolved(raise_exception_with_properties(prip="prop")),
|
||||||
|
)
|
||||||
|
|
||||||
|
- asyncio.get_event_loop().run_until_complete(test())
|
||||||
|
+ asyncio.new_event_loop().run_until_complete(test())
|
||||||
@@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 24 10:38:32 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
||||||
|
|
||||||
|
- Add py314.patch to fix tests with Python 3.14
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Jan 27 11:03:23 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
Sat Jan 27 11:03:23 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-PyHamcrest
|
# spec file for package python-PyHamcrest
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -25,6 +25,8 @@ License: BSD-3-Clause
|
|||||||
URL: https://github.com/hamcrest/PyHamcrest
|
URL: https://github.com/hamcrest/PyHamcrest
|
||||||
Source: https://files.pythonhosted.org/packages/source/p/pyhamcrest/pyhamcrest-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/p/pyhamcrest/pyhamcrest-%{version}.tar.gz
|
||||||
Patch0: 0001-Add-boolean-matchers.patch
|
Patch0: 0001-Add-boolean-matchers.patch
|
||||||
|
# PATCH-FIX-UPSTREAM https://github.com/hamcrest/PyHamcrest/pull/270 use asyncio.new_event_loop in tests for compatibility with Python 3.14
|
||||||
|
Patch1: py314.patch
|
||||||
BuildRequires: %{python_module hatch_vcs}
|
BuildRequires: %{python_module hatch_vcs}
|
||||||
BuildRequires: %{python_module hatchling}
|
BuildRequires: %{python_module hatchling}
|
||||||
BuildRequires: %{python_module hypothesis >= 1.11}
|
BuildRequires: %{python_module hypothesis >= 1.11}
|
||||||
|
|||||||
Reference in New Issue
Block a user