Merge branch 'main' into notifications

micro-manager · Aug 25, 2023 · d1f4bdd · d1f4bdd
2 parents c384635 + ef3b288
commit d1f4bdd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pycromanager/_version.py b/pycromanager/_version.py
@@ -1,2 +1,2 @@
-version_info = (0, 28, 1)
+version_info = (0, 28, 2)
 __version__ = ".".join(map(str, version_info))
diff --git 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
@@ -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):