pymmcore-plus 0.11.0__tar.gz → 0.11.1__tar.gz

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymmcore-plus
-Version: 0.11.0
+Version: 0.11.1
 Summary: pymmcore superset providing improved APIs, event handling, and a pure python acquisition engine
 Project-URL: Source, https://github.com/pymmcore-plus/pymmcore-plus
 Project-URL: Tracker, https://github.com/pymmcore-plus/pymmcore-plus/issues
@@ -53,7 +53,7 @@ Requires-Dist: mkdocstrings-python==1.1.2; extra == 'docs'
 Requires-Dist: mkdocstrings==0.22.0; extra == 'docs'
 Provides-Extra: io
 Requires-Dist: tifffile>=2021.6.14; extra == 'io'
-Requires-Dist: zarr>=2.2; extra == 'io'
+Requires-Dist: zarr<3,>=2.2; extra == 'io'
 Provides-Extra: test
 Requires-Dist: msgpack; extra == 'test'
 Requires-Dist: msgspec; extra == 'test'
@@ -65,7 +65,7 @@ Requires-Dist: rich; extra == 'test'
 Requires-Dist: tifffile>=2021.6.14; extra == 'test'
 Requires-Dist: typer>=0.4.2; extra == 'test'
 Requires-Dist: xarray; extra == 'test'
-Requires-Dist: zarr>=2.2; extra == 'test'
+Requires-Dist: zarr<3,>=2.2; extra == 'test'
 Description-Content-Type: text/markdown
 
 # pymmcore-plus

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/pyproject.toml

@@ -52,7 +52,7 @@ dependencies = [
 # https://peps.python.org/pep-0621/#dependencies-optional-dependencies
 [project.optional-dependencies]
 cli = ["typer >=0.4.2", "rich >=10.2.0"]
-io = ["tifffile >=2021.6.14", "zarr >=2.2"]
+io = ["tifffile >=2021.6.14", "zarr >=2.2,<3"]
 test = [
     "msgspec",
     "msgpack",
@@ -63,7 +63,7 @@ test = [
     "rich",
     "typer >=0.4.2",
     "tifffile >=2021.6.14",
-    "zarr >=2.2",
+    "zarr >=2.2,<3",
     "xarray",
 ]
 dev = ["ipython", "mypy", "pdbpp", "pre-commit", "ruff", "tensorstore-stubs"]

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/src/pymmcore_plus/_cli.py

@@ -31,7 +31,7 @@ def _show_version_and_exit(value: bool) -> None:
         import pymmcore
 
         typer.echo(f"pymmcore-plus v{pymmcore_plus.__version__}")
-        typer.echo(f"pymmcore v{pymmcore.__version__}")  # type: ignore [attr-defined]
+        typer.echo(f"pymmcore v{pymmcore.__version__}")
         typer.echo(f"MMCore v{pymmcore.CMMCore().getAPIVersionInfo()}")
         raise typer.Exit()
 
@@ -53,7 +53,7 @@ def _main(
     # fix for windows CI encoding and emoji printing
     if getattr(sys.stdout, "encoding", None) != "utf-8":
         with suppress(AttributeError):
-            sys.stdout.reconfigure(encoding="utf-8")  # type: ignore [attr-defined]
+            sys.stdout.reconfigure(encoding="utf-8")  # type: ignore [union-attr]
 
 
 if "mkdocs" in sys.argv[0]:  # pragma: no cover

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/src/pymmcore_plus/core/_mmcore_plus.py

@@ -1594,7 +1594,7 @@ class CMMCorePlus(pymmcore.CMMCore):
 
         try:
             channel_group = self.getPropertyFromCache("Core", "ChannelGroup")
-            channel = self.getCurrentConfigFromCache(channel_group)
+            channel: str = self.getCurrentConfigFromCache(channel_group)
         except Exception:
             channel = "Default"
         tags["Channel"] = channel
@@ -2010,7 +2010,7 @@ class CMMCorePlus(pymmcore.CMMCore):
 
         :sparkles: *This method is new in `CMMCorePlus`.*
         """
-        _current = {
+        _current: dict[str, str] = {
             self.getCameraDevice(): "Camera",
             self.getXYStageDevice(): "XYStage",
             self.getFocusDevice(): "Focus",

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/src/pymmcore_plus/mda/_engine.py

@@ -54,12 +54,11 @@ class MDAEngine(PMDAEngine):
         attempt to combine MDAEvents into a single `SequencedEvent` if
         [`core.canSequenceEvents()`][pymmcore_plus.CMMCorePlus.canSequenceEvents]
         reports that the events can be sequenced. This can be set after instantiation.
-        By default, this is `False`, in order to avoid unexpected behavior, particularly
-        in testing and demo scenarios.  But in many "real world" scenarios, this can be
-        set to `True` to improve performance.
+        By default, this is `True`, however in various testing and demo scenarios, you
+        may wish to set it to `False` in order to avoid unexpected behavior.
     """
 
-    def __init__(self, mmc: CMMCorePlus, use_hardware_sequencing: bool = False) -> None:
+    def __init__(self, mmc: CMMCorePlus, use_hardware_sequencing: bool = True) -> None:
         self._mmc = mmc
         self.use_hardware_sequencing = use_hardware_sequencing
 

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/src/pymmcore_plus/metadata/functions.py

@@ -180,7 +180,7 @@ def image_info(core: CMMCorePlus) -> ImageInfo:
     if (mag_factor := core.getMagnificationFactor()) != 1.0:
         info["magnification_factor"] = mag_factor
     if (affine := core.getPixelSizeAffine(True)) != (1.0, 0.0, 0.0, 0.0, 1.0, 0.0):
-        info["pixel_size_affine"] = affine  # type: ignore [typeddict-item]
+        info["pixel_size_affine"] = affine
 
     with suppress(RuntimeError):
         if (roi := core.getROI()) != [0, 0, w, h]:
@@ -278,7 +278,7 @@ def pixel_size_config(core: CMMCorePlus, *, config_name: str) -> PixelSizeConfig
     }
     affine = core.getPixelSizeAffineByID(config_name)
     if affine != (1.0, 0.0, 0.0, 0.0, 1.0, 0.0):
-        info["pixel_size_affine"] = affine  # type: ignore [typeddict-item]
+        info["pixel_size_affine"] = affine
     return info
 
 

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/src/pymmcore_plus/model/_microscope.py

@@ -212,7 +212,7 @@ class Microscope:
             self.devices = [
                 Device.create_from_core(core, name=name)
                 for name in core.getLoadedDevices()
-                if name != Keyword.CoreDevice
+                if name != Keyword.CoreDevice  # type: ignore [comparison-overlap]
             ]
         if "core_device" not in exclude:
             self.core_device.update_from_core(core)

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/src/pymmcore_plus/model/_pixel_size_config.py

@@ -77,7 +77,7 @@ class PixelSizeGroup(ConfigGroup):
                 preset: PixelSizePreset(
                     name=preset,
                     pixel_size_um=core.getPixelSizeUmByID(preset),
-                    affine=core.getPixelSizeAffineByID(preset),  # type: ignore
+                    affine=core.getPixelSizeAffineByID(preset),
                     settings=[Setting(*d) for d in core.getPixelSizeConfigData(preset)],
                 )
                 for preset in core.getAvailablePixelSizeConfigs()

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/tests/conftest.py

@@ -23,6 +23,7 @@ except ImportError:
 @pytest.fixture(params=PARAMS, scope="function")
 def core(request):
     core = pymmcore_plus.CMMCorePlus()
+    core.mda.engine.use_hardware_sequencing = False
     if request.param == "psygnal":
         core._events = CMMCoreSignaler()
         core.mda._signals = MDASignaler()

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/tests/test_core.py

@@ -455,7 +455,7 @@ def test_lock_and_callbacks(core: CMMCorePlus, qtbot: "QtBot") -> None:
 
     # do some threading silliness here so we don't accidentally hang our
     # test if things go wrong have to use *got_lock* to check because we
-    # can't assert in the function as theads don't throw their exceptions
+    # can't assert in the function as threads don't throw their exceptions
     # back into the calling thread.
     got_lock = False
 

{pymmcore_plus-0.11.0 → pymmcore_plus-0.11.1}/tests/test_metadata.py

@@ -85,13 +85,13 @@ def test_metadata_during_mda(
 @pytest.mark.parametrize("sequenced", [True, False], ids=["sequenced", "not-sequenced"])
 def test_multicam(core: CMMCorePlus, sequenced: bool) -> None:
     mc = "YoMulti"
-    core.loadDevice("Camer2", "DemoCamera", "DCam")
+    core.loadDevice("Camera2", "DemoCamera", "DCam")
     core.loadDevice(mc, "Utilities", "Multi Camera")
     core.initializeDevice(mc)
-    core.initializeDevice("Camer2")
-    core.setProperty("Camer2", "BitDepth", "16")
+    core.initializeDevice("Camera2")
+    core.setProperty("Camera2", "BitDepth", "16")
     core.setProperty(mc, "Physical Camera 1", "Camera")
-    core.setProperty(mc, "Physical Camera 2", "Camer2")
+    core.setProperty(mc, "Physical Camera 2", "Camera2")
     core.setCameraDevice(mc)
 
     mda = useq.MDASequence(