From 5e1aa12ff0a06dd40159339142b0034aff4fea68 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Aug 2025 15:32:32 +0200
Subject: [PATCH] python3Packages.jsonrpc-async: fix tests with pytest 8.4

---
 .../python-modules/jsonrpc-async/default.nix  |  15 ++-
 .../jsonrpc-async/mark-tests-async.patch      | 104 ++++++++++++++++++
 2 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch

diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 47d2215b9bfe..cde9fcf1114e 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -6,15 +6,13 @@
   jsonrpc-base,
   pytest-aiohttp,
   pytestCheckHook,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "jsonrpc-async";
   version = "2.1.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emlove";
@@ -23,7 +21,14 @@ buildPythonPackage rec {
     hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI=";
   };
 
-  propagatedBuildInputs = [
+  patches = [
+    # https://github.com/emlove/jsonrpc-async/pull/11
+    ./mark-tests-async.patch
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     jsonrpc-base
   ];
diff --git a/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch b/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch
new file mode 100644
index 000000000000..c63a4f8a644f
--- /dev/null
+++ b/pkgs/development/python-modules/jsonrpc-async/mark-tests-async.patch
@@ -0,0 +1,104 @@
+From af9b471eba92f1f353fec57f60e48702e79bcb80 Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Thu, 21 Aug 2025 15:24:37 +0200
+Subject: [PATCH] Fix tests with pytest 8.4
+
+Pytest 8.4 will fail on async functions, if they are not handled by a
+plugin. And since pytest-aiohttp relies on pytest-asyncio, the obvious
+fix is to mark them as asyncio.
+---
+ tests.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/tests.py b/tests.py
+index e11c4d5..547d636 100644
+--- a/tests.py
++++ b/tests.py
+@@ -11,6 +11,7 @@
+ from jsonrpc_async import Server, ProtocolError, TransportError
+ 
+ 
++@pytest.mark.asyncio
+ async def test_send_message_timeout(aiohttp_client):
+     """Test the catching of the timeout responses."""
+ 
+@@ -37,6 +38,7 @@ def create_app():
+     assert isinstance(transport_error.value.args[1], asyncio.TimeoutError)
+ 
+ 
++@pytest.mark.asyncio
+ async def test_send_message(aiohttp_client):
+     """Test the sending of messages."""
+     # catch non-json responses
+@@ -100,6 +102,7 @@ def create_app():
+         "Error calling method 'my_method': Transport Error")
+ 
+ 
++@pytest.mark.asyncio
+ async def test_exception_passthrough(aiohttp_client):
+     async def callback(*args, **kwargs):
+         raise aiohttp.ClientOSError('aiohttp exception')
+@@ -120,6 +123,7 @@ def create_app():
+     assert isinstance(transport_error.value.args[1], aiohttp.ClientOSError)
+ 
+ 
++@pytest.mark.asyncio
+ async def test_forbid_private_methods(aiohttp_client):
+     """Test that we can't call private methods (those starting with '_')."""
+     def create_app():
+@@ -137,6 +141,7 @@ def create_app():
+         await server.foo.bar._baz()
+ 
+ 
++@pytest.mark.asyncio
+ async def test_headers_passthrough(aiohttp_client):
+     """Test that we correctly send RFC headers and merge them with users."""
+     async def handler(request):
+@@ -170,6 +175,7 @@ async def callback(*args, **kwargs):
+     await server.foo()
+ 
+ 
++@pytest.mark.asyncio
+ async def test_method_call(aiohttp_client):
+     """Mixing *args and **kwargs is forbidden by the spec."""
+     def create_app():
+@@ -185,6 +191,7 @@ def create_app():
+         "JSON-RPC spec forbids mixing arguments and keyword arguments")
+ 
+ 
++@pytest.mark.asyncio
+ async def test_method_nesting(aiohttp_client):
+     """Test that we correctly nest namespaces."""
+     async def handler(request):
+@@ -211,6 +218,7 @@ def create_app():
+         "nest.testmethod.some.other.method") is True
+ 
+ 
++@pytest.mark.asyncio
+ async def test_calls(aiohttp_client):
+     """Test RPC call with positional parameters."""
+     async def handler1(request):
+@@ -265,6 +273,7 @@ def create_app():
+     await server.foobar({'foo': 'bar'})
+ 
+ 
++@pytest.mark.asyncio
+ async def test_notification(aiohttp_client):
+     """Verify that we ignore the server response."""
+     async def handler(request):
+@@ -283,6 +292,7 @@ def create_app():
+     assert await server.subtract(42, 23, _notification=True) is None
+ 
+ 
++@pytest.mark.asyncio
+ async def test_custom_loads(aiohttp_client):
+     """Test RPC call with custom load."""
+     loads_mock = mock.Mock(wraps=json.loads)
+@@ -306,6 +316,7 @@ def create_app():
+     assert loads_mock.call_count == 1
+ 
+ 
++@pytest.mark.asyncio
+ async def test_context_manager(aiohttp_client):
+     # catch non-json responses
+     async def handler1(request):