pyobs-zaber 2.0.0.dev7__tar.gz → 2.0.0.dev9__tar.gz

pyobs_zaber-2.0.0.dev9/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "uv"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "tuesday"
+    target-branch: "develop"
+    groups:
+      patch-and-minor:
+        update-types:
+          - "minor"
+          - "patch"
+    labels:
+      - "dependencies"

pyobs_zaber-2.0.0.dev9/.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,24 @@
+name: Dependabot auto-merge
+
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
+    steps:
+      - name: Fetch Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          compat-lookup: true
+      - name: Enable auto-merge for patch and minor updates
+        if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pyobs_zaber-2.0.0.dev9/.github/workflows/pyrefly.yml

@@ -0,0 +1,23 @@
+name: pyrefly
+on: push
+
+jobs:
+  pyrefly:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+          python-version: "3.13"
+
+      - name: Install packages
+        run: uv sync --all-extras --dev
+
+      - name: Run pyrefly
+        run: uv run pyrefly check

pyobs_zaber-2.0.0.dev9/.github/workflows/pytest.yml

@@ -0,0 +1,25 @@
+name: PyTest
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+          python-version: "3.13"
+
+      - name: Install packages
+        run: uv sync --all-extras --dev
+
+      - name: Run tests
+        run: uv run pytest tests
+        env:
+          CI: true

{pyobs_zaber-2.0.0.dev7 → pyobs_zaber-2.0.0.dev9}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pyobs-zaber
-Version: 2.0.0.dev7
+Version: 2.0.0.dev9
 Summary: pyobs model for Zaber motors
 Author-email: Leon Meerwart <leon.meerwart@uni-goettingen.de>
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.11
-Requires-Dist: pyobs-core<3,>=2.0.0.dev6
+Requires-Dist: pyobs-core<3,>=2.0.0.dev48
 Requires-Dist: zaber-motion<5,>=4.7.0

{pyobs_zaber-2.0.0.dev7 → pyobs_zaber-2.0.0.dev9}/pyproject.toml

@@ -1,21 +1,23 @@
 [project]
 name = "pyobs-zaber"
-version = "2.0.0.dev7"
+version = "2.0.0.dev9"
 description = "pyobs model for Zaber motors"
 authors = [{ name = "Leon Meerwart", email = "leon.meerwart@uni-goettingen.de" }]
 requires-python = ">=3.11"
 license = "MIT"
 dependencies = [
     "zaber-motion>=4.7.0,<5",
-    "pyobs-core>=2.0.0.dev6,<3",
+    "pyobs-core>=2.0.0.dev48,<3",
 ]
 
 [dependency-groups]
 dev = [
-    "black>=25.1.0,<26",
+    "black>=25.1.0,<27",
     "ruff>=0.9.0",
     "pyrefly>=1.1.1",
     "pre-commit>=4.2.0,<5",
+    "pytest>=8.0.0",
+    "pytest-asyncio>=0.24.0",
 ]
 
 [build-system]
@@ -35,3 +37,6 @@ select = ["E", "F", "W", "I", "UP", "G"]
 
 [tool.pyrefly]
 python-version = "3.11"
+
+[tool.pytest.ini_options]
+asyncio_mode = "strict"

pyobs_zaber-2.0.0.dev9/tests/test_import.py

@@ -0,0 +1,24 @@
+"""Smoke tests: import every public module and instantiate the driver class without
+hardware, asserting it advertises the interfaces it claims.
+
+No motor is involved: ZaberDriver only stores configuration, and the serial connection
+is opened lazily inside each operation.
+"""
+
+from pyobs.interfaces import IMode, IMotion
+from pyobs.modules import Module
+
+from pyobs_zaber import ZaberModeSelector
+
+
+def test_import_driver_module() -> None:
+    from pyobs_zaber import zaberdriver  # noqa: F401
+
+    assert zaberdriver.ZaberDriver is not None
+
+
+def test_instantiate_mode_selector() -> None:
+    selector = ZaberModeSelector(modes={"spec": 100.0, "phot": 200.0})
+    assert isinstance(selector, Module)
+    assert isinstance(selector, IMode)
+    assert isinstance(selector, IMotion)

pyobs_zaber-2.0.0.dev9/tests/test_zaberdriver.py

@@ -0,0 +1,42 @@
+"""Unit tests for the non-hardware logic in ZaberDriver."""
+
+from contextlib import asynccontextmanager
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+from zaber_motion import Units
+
+from pyobs_zaber.zaberdriver import ZaberDriver
+
+
+def test_constructor_defaults() -> None:
+    driver = ZaberDriver()
+    assert driver.port == "/dev/ttyUSB1"
+    assert driver.speed == 10000
+    assert driver.acceleration == 800
+    assert driver.length_unit is Units.ANGLE_DEGREES
+    assert driver.system_led is False
+
+
+@pytest.mark.asyncio
+async def test_move_by_defaults_to_configured_speed(monkeypatch: pytest.MonkeyPatch) -> None:
+    axis = MagicMock()
+    axis.move_relative_async = AsyncMock()
+
+    @asynccontextmanager
+    async def fake_axis(port):
+        yield axis
+
+    monkeypatch.setattr("pyobs_zaber.zaberdriver.zaber_axis", fake_axis)
+
+    driver = ZaberDriver(speed=12345)
+    await driver.move_by(1.0)
+
+    axis.move_relative_async.assert_awaited_once_with(
+        1.0,
+        driver.length_unit,
+        velocity=12345,
+        velocity_unit=driver.speed_unit,
+        acceleration=driver.acceleration,
+        acceleration_unit=driver.acceleration_unit,
+    )

pyobs_zaber-2.0.0.dev9/tests/test_zabermodeselector.py

@@ -0,0 +1,52 @@
+"""Unit tests for the mode-selection state logic in ZaberModeSelector.
+
+Movement itself is hardware I/O and is mocked out; these cover mode validation,
+short-circuiting, and position mapping.
+"""
+
+from unittest.mock import AsyncMock
+
+import pytest
+
+from pyobs_zaber import ZaberModeSelector
+
+_MODES = {"spec": 100.0, "phot": 200.0}
+
+
+def _make_selector() -> tuple[ZaberModeSelector, AsyncMock]:
+    selector = ZaberModeSelector(modes=_MODES)
+    move_to = AsyncMock()
+    selector.driver.move_to = move_to  # type: ignore[method-assign]
+    return selector, move_to
+
+
+def test_constructor_stores_modes_and_driver() -> None:
+    selector = ZaberModeSelector(modes=_MODES)
+    assert selector.modes == _MODES
+    assert selector.current_mode == "undefined"
+
+
+@pytest.mark.asyncio
+async def test_set_mode_moves_to_position() -> None:
+    selector, move_to = _make_selector()
+    await selector.set_mode("phot")
+    move_to.assert_awaited_once_with(200.0)
+    assert selector.current_mode == "phot"
+
+
+@pytest.mark.asyncio
+async def test_set_mode_unknown_mode_is_ignored() -> None:
+    selector, move_to = _make_selector()
+    await selector.set_mode("nope")
+    move_to.assert_not_awaited()
+    assert selector.current_mode == "undefined"
+
+
+@pytest.mark.asyncio
+async def test_set_mode_same_mode_is_noop() -> None:
+    selector, move_to = _make_selector()
+    await selector.set_mode("spec")
+    move_to.reset_mock()
+    await selector.set_mode("spec")
+    move_to.assert_not_awaited()
+    assert selector.current_mode == "spec"