pymmcore-plus 0.13.6__tar.gz → 0.13.7__tar.gz

{pymmcore_plus-0.13.6 → pymmcore_plus-0.13.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymmcore-plus
-Version: 0.13.6
+Version: 0.13.7
 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
@@ -63,8 +63,6 @@ Requires-Dist: pyside2>=5.15; extra == 'pyside2'
 Provides-Extra: pyside6
 Requires-Dist: pyside6<6.8,>=6.4.0; extra == 'pyside6'
 Provides-Extra: test
-Requires-Dist: mm-device-adapters; (sys_platform == 'darwin' and platform_machine == 'x86_64') and extra == 'test'
-Requires-Dist: mm-device-adapters; (sys_platform == 'win32') and extra == 'test'
 Requires-Dist: msgpack; extra == 'test'
 Requires-Dist: msgspec; extra == 'test'
 Requires-Dist: pytest-cov>=4; extra == 'test'

{pymmcore_plus-0.13.6 → pymmcore_plus-0.13.7}/pyproject.toml

@@ -69,8 +69,6 @@ test = [
     "tifffile >=2021.6.14",
     "zarr >=2.2,<3",
     "xarray",
-    "mm-device-adapters; sys_platform == 'win32'",
-    "mm-device-adapters; sys_platform == 'darwin' and platform_machine == 'x86_64'",
 ]
 dev = [
     "ipython",

{pymmcore_plus-0.13.6 → pymmcore_plus-0.13.7}/src/pymmcore_plus/_cli.py

@@ -1,4 +1,5 @@
 # do NOT use __future__.annotations here. It breaks typer.
+import contextlib
 import os
 import shutil
 import subprocess
@@ -143,12 +144,13 @@ def mmstudio() -> None:  # pragma: no cover
         if mm
         else None
     )
-    if not app:  # pragma: no cover
+    if not mm or not app:  # pragma: no cover
         print(f":x: [bold red]No MMStudio application found in {mm!r}")
         print("[magenta]run `mmcore install` to install a version of Micro-Manager")
         raise typer.Exit(1)
     cmd = ["open", "-a", str(app)] if PLATFORM == "Darwin" else [str(app)]
-    raise typer.Exit(subprocess.run(cmd).returncode)
+    with contextlib.chdir(mm):
+        raise typer.Exit(subprocess.run(cmd).returncode)
 
 
 @app.command()

{pymmcore_plus-0.13.6 → pymmcore_plus-0.13.7}/src/pymmcore_plus/_util.py

@@ -181,14 +181,17 @@ def find_micromanager(return_first: bool = True) -> str | None | list[str]:
     app_path = applications[sys.platform]
     pth = next(app_path.glob("[m,M]icro-[m,M]anager*"), None)
     if return_first:
-        if pth is None:
-            logger.error(
-                "could not find micromanager directory. Please run 'mmcore install'"
-            )
-            return None
-        if _mm_path_has_compatible_div(pth):  # pragma: no cover
+        if pth and _mm_path_has_compatible_div(pth):  # pragma: no cover
             logger.debug("using MM path found in applications: %s", pth)
             return str(pth)
+        from . import _pymmcore
+
+        div = _pymmcore.version_info.device_interface
+        logger.error(
+            f"could not find micromanager directory for device interface {div}. "
+            "Please run 'mmcore install'"
+        )
+        return None
     if pth is not None:
         full_list[str(pth)] = None
     return list(full_list)
@@ -659,9 +662,9 @@ def get_device_interface_version(lib_path: str | Path) -> int:
     import ctypes
 
     if sys.platform.startswith("win"):
-        lib = ctypes.WinDLL(lib_path)
+        lib = ctypes.WinDLL(str(lib_path))
     else:
-        lib = ctypes.CDLL(lib_path)
+        lib = ctypes.CDLL(str(lib_path))
 
     try:
         func = lib.GetDeviceInterfaceVersion