clan-cli: Add ruff to devShell again. Add missing type annotations

This commit is contained in:
Qubasa
2025-01-29 19:16:34 +07:00
parent 6e47f1ee96
commit 4a144e77a4
4 changed files with 7 additions and 5 deletions

View File

@@ -19,11 +19,11 @@ mkShell {
ps: ps:
with ps; with ps;
[ [
ruff
mypy mypy
] ]
++ (clan-app.devshellPyDeps ps) ++ (clan-app.devshellPyDeps ps)
)) ))
ruff
] ++ clan-app.runtimeDeps; ] ++ clan-app.runtimeDeps;
shellHook = '' shellHook = ''

View File

@@ -113,8 +113,8 @@ def nix_shell(packages: list[str], cmd: list[str]) -> list[str]:
# lazy loads list of allowed and static programs # lazy loads list of allowed and static programs
class Programs: class Programs:
allowed_programs = None allowed_programs: list[str] | None = None
static_programs = None static_programs: list[str] | None = None
@classmethod @classmethod
def is_allowed(cls: type["Programs"], program: str) -> bool: def is_allowed(cls: type["Programs"], program: str) -> bool:

View File

@@ -8,7 +8,7 @@ from typing import Any
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
# This is for simulating user input in tests. # This is for simulating user input in tests.
MOCK_PROMPT_RESPONSE = None MOCK_PROMPT_RESPONSE: None = None
class PromptType(enum.Enum): class PromptType(enum.Enum):

View File

@@ -14,11 +14,11 @@ mkShell {
ps: ps:
with ps; with ps;
[ [
ruff
mypy mypy
] ]
++ (clan-cli.devshellPyDeps ps) ++ (clan-cli.devshellPyDeps ps)
)) ))
ruff
nix-unit nix-unit
] ++ clan-cli.runtimeDependencies; ] ++ clan-cli.runtimeDependencies;
@@ -33,6 +33,8 @@ mkShell {
export PKG_ROOT="$GIT_ROOT/pkgs/clan-cli" export PKG_ROOT="$GIT_ROOT/pkgs/clan-cli"
export PYTHONWARNINGS=error export PYTHONWARNINGS=error
export CLAN_CORE_PATH="$GIT_ROOT"
# Add current package to PYTHONPATH # Add current package to PYTHONPATH
export PYTHONPATH="$PKG_ROOT''${PYTHONPATH:+:$PYTHONPATH:}" export PYTHONPATH="$PKG_ROOT''${PYTHONPATH:+:$PYTHONPATH:}"