Merge pull request #167 from ISISComputingGroup/fix_rename_workflows

Update workflows & fix pyright issues

Author: jackbdoughty

.github/workflows/Lint-and-test.yml

@@ -1,11 +1,6 @@
 name: Lint-and-test
 on: [pull_request, workflow_call]
 jobs:
-  call-linter-workflow:
-    uses: ISISComputingGroup/reusable-workflows/.github/workflows/linters.yml@main
-    with:
-      compare-branch: origin/main
-      python-ver: '3.11'
   tests:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -20,6 +15,12 @@ jobs:
           python-version: ${{ matrix.version }}
       - name: install requirements
         run: pip install -e .[dev]
+      - name: run ruff check
+        run: python -m ruff check
+      - name: run ruff format
+        run: python -m ruff format --check
+      - name: run pyright
+        run: python -m pyright
       - name: run pytest
         env:
           MPLBACKEND: agg
@@ -28,7 +29,7 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-latest
     name: Final Results
-    needs: [call-linter-workflow, tests]
+    needs: [tests]
     steps:
     - run: exit 1
       # see https://stackoverflow.com/a/67532120/4907315

.github/workflows/test-against-main.yml

@@ -1,4 +1,4 @@
-name: test-against-main
+name: future-dependency-compatibility-test
 on:
   schedule:
     - cron: "0 0 * * *"

src/ibex_bluesky_core/devices/block.py

@@ -6,14 +6,24 @@
 from dataclasses import dataclass
 from typing import Generic, TypeVar
 
-from bluesky.protocols import Locatable, Location, NamedMovable, Triggerable
+from bluesky.protocols import (
+    HasName,
+    Locatable,
+    Location,
+    Movable,
+    NamedMovable,
+    Triggerable,
+)
 from ophyd_async.core import (
+    CALCULATE_TIMEOUT,
     AsyncStatus,
+    CalculatableTimeout,
     SignalDatatype,
     SignalR,
     SignalRW,
     StandardReadable,
     StandardReadableFormat,
+    WatchableAsyncStatus,
     observe_value,
     wait_for_value,
 )
@@ -311,7 +321,7 @@ async def locate(self) -> Location[T]:
         }
 
 
-class BlockMot(Motor):
+class BlockMot(Motor, Movable[float], HasName):
     """Device representing an IBEX block pointing at a motor."""
 
     def __init__(
@@ -369,6 +379,15 @@ def __repr__(self) -> str:
         """Debug representation of this block."""
         return f"{self.__class__.__name__}(name={self.name})"
 
+    def set(  # pyright: ignore
+        self, value: float, timeout: CalculatableTimeout = CALCULATE_TIMEOUT
+    ) -> WatchableAsyncStatus[float]:
+        """Pass through set to superclass.
+
+        This is needed so that type-checker correctly understands the type of set.
+        """
+        return super().set(value, timeout)
+
 
 def block_r(datatype: type[T], block_name: str) -> BlockR[T]:
     """Get a local read-only block for the current instrument.

src/ibex_bluesky_core/plans/__init__.py

@@ -68,7 +68,11 @@ def _inner() -> Generator[Msg, None, None]:
 
 
 def _set_up_fields_and_icc(
-    block: NamedMovable[Any], dae: "SimpleDae", model: FitMethod, periods: bool, save_run: bool
+    block: NamedMovable[Any],
+    dae: "SimpleDae",
+    model: FitMethod | None,
+    periods: bool,
+    save_run: bool,
 ) -> ISISCallbacks:
     fields = [block.name]
     if periods: