pyrox.dev
python3Packages.opensearch-py: replace orphaned commit by a commit merged in upstream
https://github.com/opensearch-project/opensearch-py/pull/936 was squash
merged meaning https://github.com/opensearch-project/opensearch-py/commit/2f9eeaad3f7bd38518b23a59659ccf02fff19577
might be garbage collected soon.
This PR relace the orphaned commit by the actual merged commit.
authored by wrvsrx and committed by Masum Reza 10f00af9 7398c601
+2
-5
pkgs/development/python-modules/opensearch-py/default.nix
+2
-5
pkgs/development/python-modules/opensearch-py/default.nix
···
43
44
patches = [
45
# Remove delete event_loop fixture to fix test with pytest-asyncio 1.x
46
-
(fetchpatch {
47
-
name = "remove-delete-event-loop-fixture.patch";
48
-
url = "https://github.com/opensearch-project/opensearch-py/commit/2f9eeaad3f7bd38518b23a59659ccf02fff19577.patch";
49
-
hash = "sha256-ljg9GiXPOokrIRS+gF+W9DnZ71AzH8WmLeb3G7rLeK8=";
50
-
})
51
];
52
53
nativeBuildInputs = [ setuptools ];
+62
pkgs/development/python-modules/opensearch-py/remove-delete-event-loop-fixture.patch
+62
pkgs/development/python-modules/opensearch-py/remove-delete-event-loop-fixture.patch
···
···
1
+
From 2f9eeaad3f7bd38518b23a59659ccf02fff19577 Mon Sep 17 00:00:00 2001
2
+
From: florian <florian@harfanglab.fr>
3
+
Date: Thu, 28 Aug 2025 09:57:14 +0200
4
+
Subject: [PATCH] fix: remove delete event_loop fixture
5
+
6
+
Signed-off-by: florian <florian@harfanglab.fr>
7
+
---
8
+
.../test_async/test_transport.py | 20 +++++++++----------
9
+
1 file changed, 10 insertions(+), 10 deletions(-)
10
+
11
+
diff --git a/test_opensearchpy/test_async/test_transport.py b/test_opensearchpy/test_async/test_transport.py
12
+
index 51388dddb..34ae41b4e 100644
13
+
--- a/test_opensearchpy/test_async/test_transport.py
14
+
+++ b/test_opensearchpy/test_async/test_transport.py
15
+
@@ -439,7 +439,9 @@ async def test_sniff_on_fail_failing_does_not_prevent_retires(
16
+
assert 1 == len(conn_err.calls)
17
+
assert 1 == len(conn_data.calls)
18
+
19
+
- async def test_sniff_after_n_seconds(self, event_loop: Any) -> None:
20
+
+ async def test_sniff_after_n_seconds(self) -> None:
21
+
+ event_loop = asyncio.get_event_loop()
22
+
+
23
+
t: Any = AsyncTransport(
24
+
[{"data": CLUSTER_NODES}],
25
+
connection_class=DummyConnection,
26
+
@@ -493,9 +495,7 @@ async def test_transport_close_closes_all_pool_connections(self) -> None:
27
+
await t2.close()
28
+
assert all([conn.closed for conn in t2.connection_pool.connections])
29
+
30
+
- async def test_sniff_on_start_error_if_no_sniffed_hosts(
31
+
- self, event_loop: Any
32
+
- ) -> None:
33
+
+ async def test_sniff_on_start_error_if_no_sniffed_hosts(self) -> None:
34
+
t: Any = AsyncTransport(
35
+
[
36
+
{"data": ""},
37
+
@@ -512,9 +512,9 @@ async def test_sniff_on_start_error_if_no_sniffed_hosts(
38
+
await t._async_call()
39
+
assert str(e.value) == "TransportError(N/A, 'Unable to sniff hosts.')"
40
+
41
+
- async def test_sniff_on_start_waits_for_sniff_to_complete(
42
+
- self, event_loop: Any
43
+
- ) -> None:
44
+
+ async def test_sniff_on_start_waits_for_sniff_to_complete(self) -> None:
45
+
+ event_loop = asyncio.get_event_loop()
46
+
+
47
+
t: Any = AsyncTransport(
48
+
[
49
+
{"delay": 1, "data": ""},
50
+
@@ -550,9 +550,9 @@ async def test_sniff_on_start_waits_for_sniff_to_complete(
51
+
# and then resolved immediately after.
52
+
assert 1 <= duration < 2
53
+
54
+
- async def test_sniff_on_start_close_unlocks_async_calls(
55
+
- self, event_loop: Any
56
+
- ) -> None:
57
+
+ async def test_sniff_on_start_close_unlocks_async_calls(self) -> None:
58
+
+ event_loop = asyncio.get_event_loop()
59
+
+
60
+
t: Any = AsyncTransport(
61
+
[
62
+
{"delay": 10, "data": CLUSTER_NODES},