Go back to mypy

pyproject.toml

@@ -41,11 +41,11 @@ dev = [
     "scanspec[plotting]",
     "scanspec[service]",
     "copier",
+    "mypy",
     "myst-parser",
     "pipdeptree",
     "pre-commit",
     "pydata-sphinx-theme>=0.12",
-    "pyright",
     "pytest",
     "pytest-cov",
     "ruff",
@@ -73,8 +73,8 @@ name = "Tom Cobb"
 [tool.setuptools_scm]
 write_to = "src/scanspec/_version.py"
 
-[tool.pyright]
-reportMissingImports = false # Ignore missing stubs in imported modules
+[tool.mypy]
+ignore_missing_imports = true # Ignore missing stubs in imported modules
 
 [tool.pytest.ini_options]
 # Run pytest with all our checkers, and don't spam us with massive tracebacks on error
@@ -100,19 +100,19 @@ legacy_tox_ini = """
 [tox]
 skipsdist=True
 
-[testenv:{pre-commit,pyright,pytest,docs}]
+[testenv:{pre-commit,mypy,pytest,docs}]
 # Don't create a virtualenv for the command, requires tox-direct plugin
 direct = True
 passenv = *
 allowlist_externals =
     pytest
     pre-commit
-    pyright
+    mypy
     sphinx-build
     sphinx-autobuild
 commands =
     pytest: pytest --cov=scanspec --cov-report term --cov-report xml:cov.xml {posargs}
-    pyright: pyright src tests {posargs}
+    mypy: mypy src tests {posargs}
     pre-commit: pre-commit run --all-files {posargs}
     docs: sphinx-{posargs:build -EW --keep-going} -T docs build/html
 """

src/scanspec/core.py

@@ -370,7 +370,7 @@ def zip_gap(gaps: Sequence[np.ndarray]) -> np.ndarray:
 
 def _merge_frames(
     *stack: Frames[Axis],
-    dict_merge=Callable[[Sequence[AxesPoints[Axis]]], AxesPoints[Axis]],
+    dict_merge=Callable[[Sequence[AxesPoints[Axis]]], AxesPoints[Axis]],  # type: ignore
     gap_merge=Callable[[Sequence[np.ndarray]], Optional[np.ndarray]],
 ) -> Frames[Axis]:
     types = {type(fs) for fs in stack}

src/scanspec/specs.py

@@ -103,7 +103,7 @@ def concat(self, other: Spec) -> Concat[Axis]:
 
     def serialize(self) -> Mapping[str, Any]:
         """Serialize the spec to a dictionary."""
-        return asdict(self)
+        return asdict(self)  # type: ignore
 
     @classmethod
     def deserialize(cls, obj):