From b0cb55e19cc5438b93cd81ee7742e75f4ac3290c Mon Sep 17 00:00:00 2001 From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:52:14 -0700 Subject: [PATCH 1/3] fix function for shutting down headless process --- pycromanager/_version.py | 2 +- pycromanager/acq_util.py | 5 +++-- pycromanager/test/conftest.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pycromanager/_version.py b/pycromanager/_version.py index df280057..0a56e4ce 100644 --- a/pycromanager/_version.py +++ b/pycromanager/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 27, 5) +version_info = (0, 28, 0) __version__ = ".".join(map(str, version_info)) diff --git a/pycromanager/acq_util.py b/pycromanager/acq_util.py index c0b3152e..fd2c01a8 100644 --- a/pycromanager/acq_util.py +++ b/pycromanager/acq_util.py @@ -11,13 +11,14 @@ SUBPROCESSES = [] -def cleanup(): +def stop_headless(): for p in SUBPROCESSES: p.terminate() p.wait() # wait for process to terminate + SUBPROCESSES.clear() # make sure any Java processes are cleaned up when Python exits -atexit.register(cleanup) +atexit.register(stop_headless) def start_headless( mm_app_path: str, config_file: str='', java_loc: str=None, core_log_path: str='', diff --git a/pycromanager/test/conftest.py b/pycromanager/test/conftest.py index ca6aef1c..5fe3cf84 100644 --- a/pycromanager/test/conftest.py +++ b/pycromanager/test/conftest.py @@ -10,7 +10,7 @@ import pycromanager from pycromanager import start_headless -from pycromanager.acq_util import cleanup +from pycromanager.acq_util import stop_headless import socket def is_port_in_use(port): From d152a994155ee04f48f5b602bf5bb89515b1d02b Mon Sep 17 00:00:00 2001 From: AcqEngJ-Bot <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 20:27:54 +0000 Subject: [PATCH 2/3] update AcqEngJ version and PycroManagerJava version (Created by Github action) --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index d9d4b426..e230a39c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.micro-manager.pycro-manager PycroManagerJava - 0.41.9 + 0.41.10 jar Pycro-Manager Java The Java components of Pycro-Manager @@ -54,7 +54,7 @@ org.micro-manager.acqengj AcqEngJ - 0.32.0 + 0.32.1 org.micro-manager.ndviewer From c81eba135ea859caa5a4cfbc81824d3eee23eef0 Mon Sep 17 00:00:00 2001 From: AcqEngJ-Bot <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 21:10:17 +0000 Subject: [PATCH 3/3] update AcqEngJ version and PycroManagerJava version (Created by Github action) --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index e230a39c..ea0057dd 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.micro-manager.pycro-manager PycroManagerJava - 0.41.10 + 0.41.11 jar Pycro-Manager Java The Java components of Pycro-Manager @@ -54,7 +54,7 @@ org.micro-manager.acqengj AcqEngJ - 0.32.1 + 0.32.2 org.micro-manager.ndviewer