🏷️ types: move to ty

.vscode/extensions.json

@@ -1,7 +1,7 @@
 {
   "recommendations": [
     "ms-python.python",
-    "ms-python.vscode-pylance",
+    "astral-sh.ty",
     "charliermarsh.ruff",
     "esbenp.prettier-vscode",
     "EditorConfig.EditorConfig",

.vscode/settings.json

@@ -1,8 +1,5 @@
 {
   "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
-  "python.analysis.typeCheckingMode": "strict",
-  "python.analysis.inlayHints.functionReturnTypes": true,
-  "python.analysis.inlayHints.variableTypes": true,
   "[python]": {
     "editor.defaultFormatter": "charliermarsh.ruff"
   }

justfile

@@ -11,7 +11,7 @@ fmt:
   uv run ruff format .
 
 lint:
-  uv run pyright src/watchfs tests
+  uv run ty check --error-on-warning src/watchfs tests
   uv run ruff check .
 
 fmt-docs:

pyproject.toml

@@ -35,18 +35,13 @@ watchfs = "watchfs.__main__:main"
 
 [dependency-groups]
 dev = [
-  "pyright>=1.1.406",
+  "ty>=0.0.32",
   "ruff>=0.14.0",
   "pytest>=8.4.2",
   "pytest-rerunfailures>=16.0.1",
   "tomli>=2.2.1",
 ]
 
-[tool.pyright]
-include = ["src/watchfs", "tests"]
-pythonVersion = "3.12"
-typeCheckingMode = "strict"
-
 [tool.ruff]
 line-length = 120
 target-version = "py312"
@@ -91,8 +86,6 @@ select = [
 ]
 ignore = [
   "E501", # line too long, duplicate with ruff fmt
-  "F401", # imported but unused, duplicate with pyright
-  "F841", # local variable is assigned to but never used, duplicate with pyright
 ]
 
 [tool.ruff.lint.isort]

src/watchfs/__main__.py

@@ -8,7 +8,7 @@
 from typing import TYPE_CHECKING
 
 from colored import Back, Fore
-from watchfiles import Change, awatch  # type: ignore
+from watchfiles import Change, awatch
 
 from watchfs import __version__
 from watchfs.as_sync import as_sync

src/watchfs/exceptions.py

@@ -32,10 +32,12 @@ class ParseError(WatchFsBaseException):
     code = ErrorCode.PARSE_ERROR
 
 
-def handleUncaughtException(exctype: type[Exception], exception: Exception, trace: TracebackType):
-    oldHook(exctype, exception, trace)
+def handle_uncaught_exception(
+    exctype: type[BaseException], exception: BaseException, trace: TracebackType | None
+) -> None:
+    old_hook(exctype, exception, trace)
     if isinstance(exception, WatchFsBaseException):
-        sys.exit(exception.code.value)
+        raise SystemExit(exception.code.value)
 
 
-sys.excepthook, oldHook = handleUncaughtException, sys.excepthook
+old_hook, sys.excepthook = sys.excepthook, handle_uncaught_exception

src/watchfs/mappings.py

@@ -107,6 +107,8 @@ def parse_sync_mapping(sync_mapping: str) -> Result[tuple[SyncMapping, bool], Pa
 
                     return Ok((SyncMapping(source=src_spec.path, target=dst_spec), bidirectional))
 
+    raise AssertionError("unreachable")
+
 
 def _parse_ssh_url(spec: str) -> Result[SshTargetSpec, ParseError]:
     parsed = urlparse(spec)

src/watchfs/targets.py

@@ -127,12 +127,19 @@ async def _run_command(
     *,
     stdin: IO[bytes] | int | None = None,
 ) -> subprocess.CompletedProcess[bytes]:
-    return await asyncio.to_thread(
-        subprocess.run,
+    return await asyncio.to_thread(_run_command_sync, command, stdin=stdin)
+
+
+def _run_command_sync(
+    command: list[str],
+    *,
+    stdin: IO[bytes] | int | None = None,
+) -> subprocess.CompletedProcess[bytes]:
+    return subprocess.run(
         command,
         stdin=stdin if stdin is not None else subprocess.DEVNULL,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        capture_output=True,
+        text=False,
     )