chore: update sources (#87)

* chore: update sources

* chore: update version to 12.5.0.75.0 and reset PYMMCORE_NANO_VERSION to 0

* try remove

* chore: update CI and deploy workflows to use TheMrMilchmann/setup-msvc-dev@v4 with architecture specification

* Refactor code structure for improved readability and maintainability

* test: add per-device timeout tests and update sequence acquisition keyword

Author: tlambert03

.github/workflows/ci.yml

@@ -32,10 +32,10 @@ jobs:
       - uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
-      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: TheMrMilchmann/setup-msvc-dev@v4
         if: matrix.platform == 'windows-latest'
         with:
-          vsversion: "2022"
+          arch: x64
 
       - name: install
         # install with coverage=true
@@ -72,10 +72,10 @@ jobs:
         with:
           python-version: "3.13"
           enable-cache: true
-      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: TheMrMilchmann/setup-msvc-dev@v4
         if: matrix.os == 'windows-latest'
         with:
-          vsversion: "2022"
+          arch: x64
       - name: Setup MM test adapters
         uses: pymmcore-plus/setup-mm-test-adapters@main
         with:

.github/workflows/deploy.yml

@@ -42,9 +42,10 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: TheMrMilchmann/setup-msvc-dev@v4
+        if: runner.os == 'Windows'
         with:
-          vsversion: "2022"
+          arch: x64
       - uses: astral-sh/setup-uv@v7
       - run: uv run scripts/extract_version.py --update
 

meson.build

@@ -3,7 +3,7 @@
 project(
   'pymmcore-nano',
   'cpp',
-version : '12.2.0.75.1',
+version : '12.5.0.75.0',
   meson_version : '>=1.4.0',
   default_options : ['cpp_std=c++17']
 )

pyproject.toml

@@ -40,6 +40,7 @@ build = ["meson-python", "nanobind", "ninja", "ruff", "typing_extensions"]
 test = [
     "pytest",
     "pytest-cov",
+    "pytest-rerunfailures",
     "gcovr",
     "libclang>=18.1.1",
     "pymmcore-nano[test-devices]",

src/_pymmcore_nano.cc

@@ -16,7 +16,7 @@ namespace nb = nanobind;
 
 using namespace nb::literals;
 
-const std::string PYMMCORE_NANO_VERSION = "1";
+const std::string PYMMCORE_NANO_VERSION = "0";
 
 ///////////////// GIL_MACROS ///////////////////
 
@@ -969,6 +969,10 @@ MMCore will send notifications on internal events using this interface
         .def("usesDeviceDelay", &CMMCore::usesDeviceDelay, "label"_a RGIL)
         .def("setTimeoutMs", &CMMCore::setTimeoutMs, "timeoutMs"_a RGIL)
         .def("getTimeoutMs", &CMMCore::getTimeoutMs RGIL)
+        .def("setDeviceTimeoutMs", &CMMCore::setDeviceTimeoutMs, "label"_a, "timeoutMs"_a RGIL)
+        .def("unsetDeviceTimeout", &CMMCore::unsetDeviceTimeout, "label"_a RGIL)
+        .def("getDeviceTimeoutMs", &CMMCore::getDeviceTimeoutMs, "label"_a RGIL)
+        .def("hasDeviceTimeout", &CMMCore::hasDeviceTimeout, "label"_a RGIL)
         .def("sleep", &CMMCore::sleep, "intervalMs"_a RGIL)
 
         .def("getCameraDevice", &CMMCore::getCameraDevice RGIL)
@@ -1206,20 +1210,20 @@ MMCore will send notifications on internal events using this interface
         .def("startSequenceAcquisition",
              nb::overload_cast<long, double, bool>(&CMMCore::startSequenceAcquisition),
              "numImages"_a,
-             "intervalMs"_a,
+             "unused"_a,
              "stopOnOverflow"_a RGIL)
         .def("startSequenceAcquisition",
              nb::overload_cast<const char *, long, double, bool>(
                  &CMMCore::startSequenceAcquisition),
              "cameraLabel"_a,
              "numImages"_a,
-             "intervalMs"_a,
+             "unused"_a,
              "stopOnOverflow"_a RGIL)
         .def(
             "prepareSequenceAcquisition", &CMMCore::prepareSequenceAcquisition, "cameraLabel"_a RGIL)
         .def("startContinuousSequenceAcquisition",
              &CMMCore::startContinuousSequenceAcquisition,
-             "intervalMs"_a RGIL)
+             "unused"_a RGIL)
         .def("stopSequenceAcquisition", nb::overload_cast<>(&CMMCore::stopSequenceAcquisition) RGIL)
         .def("stopSequenceAcquisition",
              nb::overload_cast<const char *>(&CMMCore::stopSequenceAcquisition),

subprojects/mmcore.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/micro-manager/mmcore.git
-revision = 29e7de3344988e4b5886c4d7368f72fd61366e42
+revision = 8399a00b7210fd0775f3fe51392828a69c9aa57b
 depth = 1
 
 [provide]

subprojects/mmdevice.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/micro-manager/mmdevice.git
-revision = 7e648e90ec170dcdc1a798d596f9b358e4cd8eb6
+revision = b31dbbcca65a9a5120232518b9b061e81092a896
 depth = 1
 
 [provide]

tests/test_core.py

@@ -152,6 +152,8 @@ def test_device_loading(core: pmn.CMMCore) -> None:
 
 
 # have to use capfd to capture stderr, capsys won't work
+# Flaky on macOS CI: capfd occasionally returns partial/null-filled reads
+@pytest.mark.flaky(reruns=2)
 def test_core_logging(capfd: pytest.CaptureFixture, tmp_path: Path) -> None:
     mmc = pmn.CMMCore()
     # no file logging at start
@@ -211,6 +213,47 @@ def test_core(demo_core: pmn.CMMCore) -> None:
     assert isinstance(cfg, pmn.Configuration)
 
 
+def test_per_device_timeout(demo_core: pmn.CMMCore) -> None:
+    global_timeout = demo_core.getTimeoutMs()
+
+    # No override is set initially; effective timeout equals global timeout.
+    assert not demo_core.hasDeviceTimeout("Camera")
+    assert demo_core.getDeviceTimeoutMs("Camera") == global_timeout
+
+    demo_core.setDeviceTimeoutMs("Camera", global_timeout + 1234)
+    assert demo_core.hasDeviceTimeout("Camera")
+    assert demo_core.getDeviceTimeoutMs("Camera") == global_timeout + 1234
+    # Global timeout is unaffected by the per-device override.
+    assert demo_core.getTimeoutMs() == global_timeout
+
+    demo_core.unsetDeviceTimeout("Camera")
+    assert not demo_core.hasDeviceTimeout("Camera")
+    assert demo_core.getDeviceTimeoutMs("Camera") == global_timeout
+
+    # The Core device cannot have a per-device override.
+    assert not demo_core.hasDeviceTimeout("Core")
+    assert demo_core.getDeviceTimeoutMs("Core") == global_timeout
+    with pytest.raises(pmn.CMMError, match="Core device"):
+        demo_core.setDeviceTimeoutMs("Core", 1000)
+
+    with pytest.raises(pmn.CMMError, match="must be positive"):
+        demo_core.setDeviceTimeoutMs("Camera", 0)
+    with pytest.raises(pmn.CMMError, match=r'No device with label "Bogus"'):
+        demo_core.setDeviceTimeoutMs("Bogus", 1000)
+
+
+def test_sequence_acquisition_unused_kwarg(demo_core: pmn.CMMCore) -> None:
+    # Upstream renamed the always-ignored `intervalMs` parameter to `unused`;
+    # confirm the new keyword name is accepted by all three overloads.
+    demo_core.startSequenceAcquisition(2, unused=0, stopOnOverflow=False)
+    _wait_until(lambda: not demo_core.isSequenceRunning())
+    demo_core.startSequenceAcquisition("Camera", 2, unused=0, stopOnOverflow=False)
+    _wait_until(lambda: not demo_core.isSequenceRunning())
+    demo_core.startContinuousSequenceAcquisition(unused=0)
+    _wait_until(lambda: demo_core.isSequenceRunning())
+    demo_core.stopSequenceAcquisition()
+
+
 def test_camera_snap(demo_core: pmn.CMMCore) -> None:
     assert demo_core.getCameraDevice() == "Camera"
     # change image dimensions to make it non-square