large-image-source-bioformats 1.26.3__tar.gz → 1.26.3.dev4__tar.gz

{large-image-source-bioformats-1.26.3 → large-image-source-bioformats-1.26.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-bioformats
-Version: 1.26.3
+Version: 1.26.3.dev4
 Summary: An bioformats tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-source-bioformats-1.26.3 → large-image-source-bioformats-1.26.3.dev4}/large_image_source_bioformats/__init__.py

@@ -26,12 +26,10 @@ import atexit
 import logging
 import math
 import os
-import pathlib
 import re
 import threading
 import types
 import weakref
-import zipfile
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as _importlib_version
 
@@ -55,8 +53,6 @@ bioformats = None
 javabridge = None
 
 _javabridgeStarted = None
-_javabridgeStartLock = threading.Lock()
-_bioformatsVersion = None
 _openImages = []
 
 
@@ -91,7 +87,7 @@ def _monitor_thread():
 
 
 def _reduceLogging():
-    # As of python-bioformats 4.0.0, org.apache.log4j isn't in the bundled
+    # As of bioformat 4.0.0, org.apache.log4j isn't in the bundled
     # jar file, so setting log levels just produces needless warnings.
     # bioformats.log4j.basic_config()
     # javabridge.JClassWrapper('loci.common.Log4jTools').setRootLevel(
@@ -114,40 +110,30 @@ def _reduceLogging():
 
 
 def _startJavabridge(logger):
-    global _javabridgeStarted, _bioformatsVersion
-
-    with _javabridgeStartLock:
-        if _javabridgeStarted is None:
-            # Only import these when first asked.  They are slow to import.
-            global bioformats
-            global javabridge
-            if bioformats is None:
-                import bioformats
-                try:
-                    _bioformatsVersion = zipfile.ZipFile(
-                        pathlib.Path(bioformats.__file__).parent /
-                        'jars/bioformats_package.jar',
-                    ).open('META-INF/MANIFEST.MF').read(8192).split(
-                        b'Implementation-Version: ')[1].split()[0].decode()
-                    logger.info('Bioformats.jar version: %s', _bioformatsVersion)
-                except Exception:
-                    pass
-            if javabridge is None:
-                import javabridge
+    global _javabridgeStarted
 
-            # We need something to wake up at exit and shut things down
-            monitor = threading.Thread(target=_monitor_thread)
-            monitor.daemon = True
-            monitor.start()
-            try:
-                javabridge.start_vm(class_path=bioformats.JARS, run_headless=True)
-                _reduceLogging()
-                atexit.register(_stopJavabridge)
-                logger.info('Started JVM for Bioformats tile source.')
-                _javabridgeStarted = True
-            except RuntimeError:
-                logger.exception('Cannot start JVM for Bioformats tile source.')
-                _javabridgeStarted = False
+    if _javabridgeStarted is None:
+        # Only import these when first asked.  They are slow to import.
+        global bioformats
+        global javabridge
+        if bioformats is None:
+            import bioformats
+        if javabridge is None:
+            import javabridge
+
+        # We need something to wake up at exit and shut things down
+        monitor = threading.Thread(target=_monitor_thread)
+        monitor.daemon = True
+        monitor.start()
+        try:
+            javabridge.start_vm(class_path=bioformats.JARS, run_headless=True)
+            _reduceLogging()
+            atexit.register(_stopJavabridge)
+            logger.info('Started JVM for Bioformats tile source.')
+            _javabridgeStarted = True
+        except RuntimeError:
+            logger.exception('Cannot start JVM for Bioformats tile source.')
+            _javabridgeStarted = False
     return _javabridgeStarted
 
 
@@ -159,21 +145,6 @@ def _stopJavabridge(*args, **kwargs):
     _javabridgeStarted = None
 
 
-def _getBioformatsVersion():
-    """
-    Get the version of the jar file.
-
-    :returns: the version string if it is in the expected format, None
-        otherwise.
-    """
-    if _bioformatsVersion is None:
-        from large_image import config
-
-        logger = config.getLogger()
-        _startJavabridge(logger)
-    return _bioformatsVersion
-
-
 class BioformatsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
     """
     Provides tile access to via Bioformats.

{large-image-source-bioformats-1.26.3 → large-image-source-bioformats-1.26.3.dev4}/large_image_source_bioformats.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-bioformats
-Version: 1.26.3
+Version: 1.26.3.dev4
 Summary: An bioformats tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-source-bioformats-1.26.3.dev4/large_image_source_bioformats.egg-info/requires.txt

@@ -0,0 +1,5 @@
+large-image>=1.26.3.dev4
+python-bioformats>=1.5.2
+
+[girder]
+girder-large-image>=1.26.3.dev4

large-image-source-bioformats-1.26.3/large_image_source_bioformats.egg-info/requires.txt

@@ -1,5 +0,0 @@
-large-image>=1.26.3
-python-bioformats>=1.5.2
-
-[girder]
-girder-large-image>=1.26.3