Merge pull request #2667 from pre-commit/env-dir-always-non-null

asottile · web-flow · commit 0224be819458 · 2023-01-01T19:52:48.000-05:00
remove None overload for environment_dir
diff --git a/pre_commit/languages/helpers.py b/pre_commit/languages/helpers.py
@@ -6,7 +6,6 @@
 import re
 from typing import Any
 from typing import NoReturn
-from typing import overload
 from typing import Sequence
 
 import pre_commit.constants as C
@@ -48,17 +47,8 @@ def run_setup_cmd(prefix: Prefix, cmd: tuple[str, ...], **kwargs: Any) -> None:
     cmd_output_b(*cmd, cwd=prefix.prefix_dir, **kwargs)
 
 
-@overload
-def environment_dir(d: None, language_version: str) -> None: ...
-@overload
-def environment_dir(d: str, language_version: str) -> str: ...
-
-
-def environment_dir(d: str | None, language_version: str) -> str | None:
-    if d is None:
-        return None
-    else:
-        return f'{d}-{language_version}'
+def environment_dir(d: str, language_version: str) -> str:
+    return f'{d}-{language_version}'
 
 
 def assert_version_default(binary: str, version: str) -> None:
diff --git a/pre_commit/repository.py b/pre_commit/repository.py
@@ -50,15 +50,16 @@ def _write_state(prefix: Prefix, venv: str, state: object) -> None:
 
 def _hook_installed(hook: Hook) -> bool:
     lang = languages[hook.language]
+    if lang.ENVIRONMENT_DIR is None:
+        return True
+
     venv = environment_dir(lang.ENVIRONMENT_DIR, hook.language_version)
     return (
-        venv is None or (
-            (
-                _read_state(hook.prefix, venv) ==
-                _state(hook.additional_dependencies)
-            ) and
-            not lang.health_check(hook.prefix, hook.language_version)
-        )
+        (
+            _read_state(hook.prefix, venv) ==
+            _state(hook.additional_dependencies)
+        ) and
+        not lang.health_check(hook.prefix, hook.language_version)
     )
 
 
