simplify install state

the additional bookkeeping has been unnecessary since b827694520

unfortunately this will cause a rebuild of all hooks in order to be
forward/backward compatible -- shrugs
This commit is contained in:
Anthony Sottile
2023-01-02 16:00:27 -05:00
parent c787efd558
commit 0920cb33ee
2 changed files with 4 additions and 25 deletions

View File

@@ -5,8 +5,6 @@ import importlib.metadata
CONFIG_FILE = '.pre-commit-config.yaml'
MANIFEST_FILE = '.pre-commit-hooks.yaml'
# Bump when installation changes in a backwards / forwards incompatible way
INSTALLED_STATE_VERSION = '1'
# Bump when modifying `empty_template`
LOCAL_REPO_VERSION = '1'

View File

@@ -1,6 +1,5 @@
from __future__ import annotations
import json
import logging
import os
from typing import Any
@@ -23,21 +22,8 @@ from pre_commit.util import rmtree
logger = logging.getLogger('pre_commit')
def _state(additional_deps: Sequence[str]) -> object:
return {'additional_dependencies': sorted(additional_deps)}
def _state_filename(venv: str) -> str:
return os.path.join(venv, f'.install_state_v{C.INSTALLED_STATE_VERSION}')
def _read_state(venv: str) -> object | None:
filename = _state_filename(venv)
if not os.path.exists(filename):
return None
else:
with open(filename) as f:
return json.load(f)
return os.path.join(venv, '.install_state_v2')
def _hook_installed(hook: Hook) -> bool:
@@ -51,7 +37,7 @@ def _hook_installed(hook: Hook) -> bool:
hook.language_version,
)
return (
_read_state(venv) == _state(hook.additional_dependencies) and
os.path.exists(_state_filename(venv)) and
not lang.health_check(hook.prefix, hook.language_version)
)
@@ -87,13 +73,8 @@ def _hook_install(hook: Hook) -> None:
f'your environment\n\n'
f'more info:\n\n{health_error}',
)
# Write our state to indicate we're installed
state_filename = _state_filename(venv)
staging = f'{state_filename}staging'
with open(staging, 'w') as state_file:
state_file.write(json.dumps(_state(hook.additional_dependencies)))
# Move the file into place atomically to indicate we've installed
os.replace(staging, state_filename)
# touch state file to indicate we're installed
open(_state_filename(venv), 'a+').close()
def _hook(