From c28e84e76afeffb6f047e28611304dce628fbc6e Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 25 May 2026 10:47:33 +0200 Subject: [PATCH 1/2] Handle new graalpy name in virtualenv seeder --- graalpy_virtualenv_seeder/graalpy_virtualenv_seeder/graalpy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graalpy_virtualenv_seeder/graalpy_virtualenv_seeder/graalpy.py b/graalpy_virtualenv_seeder/graalpy_virtualenv_seeder/graalpy.py index 94896f0024..1a594b8cb0 100644 --- a/graalpy_virtualenv_seeder/graalpy_virtualenv_seeder/graalpy.py +++ b/graalpy_virtualenv_seeder/graalpy_virtualenv_seeder/graalpy.py @@ -138,7 +138,7 @@ def set_pyenv_cfg(self): _get_default_orig = SeederSelector._get_default def _seeder_selector_get_default_override(self): - if self.interpreter.implementation == "GraalVM": + if self.interpreter.implementation.lower() in ("graalvm", "graalpy"): return "graalpy" else: return _get_default_orig() From 4fa0726ba0f936b9f8d47b516605d7bbb9c57e19 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 25 May 2026 12:31:40 +0200 Subject: [PATCH 2/2] Tolerate positive signal exit codes in tests --- graalpython/lib-python/3/test/_test_multiprocessing.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/graalpython/lib-python/3/test/_test_multiprocessing.py b/graalpython/lib-python/3/test/_test_multiprocessing.py index 2903cb25b5..625454b371 100644 --- a/graalpython/lib-python/3/test/_test_multiprocessing.py +++ b/graalpython/lib-python/3/test/_test_multiprocessing.py @@ -3221,7 +3221,8 @@ def test_mymanager(self): # bpo-30356: BaseManager._finalize_manager() sends SIGTERM # to the manager process if it takes longer than 1 second to stop, # which happens on slow buildbots. - self.assertIn(manager._process.exitcode, (0, -signal.SIGTERM)) + # GraalPy change: JVM exits with 143 on SIGTERM + self.assertIn(manager._process.exitcode, (0, -signal.SIGTERM, 128 + signal.SIGTERM)) def test_mymanager_context(self): manager = MyManager(shutdown_timeout=SHUTDOWN_TIMEOUT) @@ -3230,7 +3231,8 @@ def test_mymanager_context(self): # bpo-30356: BaseManager._finalize_manager() sends SIGTERM # to the manager process if it takes longer than 1 second to stop, # which happens on slow buildbots. - self.assertIn(manager._process.exitcode, (0, -signal.SIGTERM)) + # GraalPy change: JVM exits with 143 on SIGTERM + self.assertIn(manager._process.exitcode, (0, -signal.SIGTERM, 128 + signal.SIGTERM)) def test_mymanager_context_prestarted(self): manager = MyManager(shutdown_timeout=SHUTDOWN_TIMEOUT)