update to pyjavaz with fixed concurrency issues

micro-manager · Jun 14, 2024 · 59ece1b · 59ece1b
1 parent 7ce58ad
commit 59ece1b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/pycromanager/acquisition/RAMStorage_java.py b/pycromanager/acquisition/RAMStorage_java.py
@@ -57,8 +57,6 @@ def read_image(self, channel=None, z=None, time=None, position=None, row=None, c
         for k, v in axes.items():
             java_hashmap.put(k, v)
         tagged_image = self._java_RAM_data_storage.get_image(java_hashmap)
-        print('java ram storage class:', str(self._java_RAM_data_storage))
-        print('tagged image: ', str(tagged_image))
         pixels = tagged_image.pix
         metadata = tagged_image.tags
         return pixels.reshape(metadata['Height'], metadata['Width'])

diff --git a/pycromanager/acquisition/java_backend_acquisitions.py b/pycromanager/acquisition/java_backend_acquisitions.py
@@ -320,7 +320,6 @@ def __init__(
         # while the acquisition is still running, and (optionally )so that a image_saved_fn can be called
         # when images are written to disk/RAM storage
         storage_java_class = data_sink.get_storage()
-        print(storage_java_class)
         summary_metadata = storage_java_class.get_summary_metadata()
         if directory is not None:
             # NDTiff dataset saved to disk on Java side

diff --git a/pycromanager/test/conftest.py b/pycromanager/test/conftest.py
@@ -131,9 +131,7 @@ def install_mm():
 
 
 
-# @pytest.fixture(scope="session",  params=['save_to_disk', 'RAM'])
-@pytest.fixture(scope="session",  params=['RAM'])
-
+@pytest.fixture(scope="session",  params=['save_to_disk', 'RAM'])
 def setup_data_folder(request):
     if request.param != 'save_to_disk':
         yield None
@@ -147,9 +145,7 @@ def setup_data_folder(request):
         shutil.rmtree(data_folder_path)
 
 
-# @pytest.fixture(scope="session", params=['python_backend', 'java_backend'])
-@pytest.fixture(scope="session", params=['java_backend'])
-
+@pytest.fixture(scope="session", params=['python_backend', 'java_backend'])
 def launch_mm_headless(request, install_mm):
     python_backend = request.param == 'python_backend'
     mm_install_dir = install_mm

diff --git a/requirements.txt b/requirements.txt
@@ -5,4 +5,4 @@ ndstorage>=0.1.5
 docstring-inheritance
 pymmcore
 sortedcontainers
-pyjavaz>=1.2
+pyjavaz>=1.2.1