enable pyright again

fpletz · Sep 13, 2024 · a671de0 · a671de0
1 parent 036bf02
commit a671de0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/flake.nix b/flake.nix
@@ -29,6 +29,9 @@
               urllib3 = prev.urllib3.overridePythonAttrs (attrs: {
                 nativeBuildInputs = attrs.nativeBuildInputs ++ [ final.hatch-vcs ];
               });
+              pyright = prev.pyright.overridePythonAttrs (attrs: {
+                nativeBuildInputs = attrs.nativeBuildInputs ++ [ final.setuptools ];
+              });
             }
           );
           python-vatsim = pkgs'.poetry2nix.mkPoetryApplication {

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ regex = ">=2023.12.25,<2025.0.0"
 ruff = "0.6.1"
 pytest = "^8"
 pytest-cov = ">=4.1,<6.0"
-#pyright = "1.1.379"
+pyright = "1.1.380"
 
 [tool.pytest.ini_options]
 addopts = ["--cov-report=term", "--cov-report=xml:cov.xml", "--cov=vatsim"]

diff --git a/vatsim/types.py b/vatsim/types.py
@@ -30,8 +30,8 @@ def callsign_validator(cls, v: str) -> str:
 
     @model_validator(mode="before")
     @classmethod
-    def atis_validator(cls, data: dict[str, Any] | Any) -> Any:
-        if isinstance(data, dict) and "text_atis" in data:
+    def atis_validator(cls, data: dict[str, Any]) -> dict[str, Any]:
+        if "text_atis" in data:
             if data["text_atis"] is not None:
                 if not isinstance(data["text_atis"], str):
                     data["text_atis"] = "\n".join(cast(list[str], data["text_atis"]))