From d4f117dd53202ea3ba32ad88b7e1154ac215ec23 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 1 Jul 2024 08:52:35 -0500 Subject: [PATCH 1/2] Unpin psutil dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1db500ba..b4cbfa5a 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ }, install_requires=[ "asgiref", - "psutil>=5,<6", + "psutil>=5", "urllib3", "certifi", "wrapt>=1.10,<2.0", From 531faa5b26803f18b18b56576d544d8c29816bd7 Mon Sep 17 00:00:00 2001 From: "Lance T. Erickson" Date: Fri, 4 Oct 2024 11:25:35 -0500 Subject: [PATCH 2/2] Update test for new psutil behavior It is unlikely, but if the internal process cache is not cleared, we could have a stale result. --- tests/conftest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index ba017fc5..c4dc1542 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -163,7 +163,11 @@ def core_agent_manager(core_agent_dir): def core_agent_is_running(): - return any(p.name() == "core-agent" for p in psutil.process_iter(["name"])) + return any( + p.name() == "core-agent" + for p in psutil.process_iter(["name"]) + if p.is_running() + ) def terminate_core_agent_processes():