diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit index d3fa312..6405fa4 100755 --- a/git_hooks/pre-commit +++ b/git_hooks/pre-commit @@ -1,10 +1,6 @@ #!/bin/sh # -# Pre-commit hook script that ensures mypy checks and tests pass +# Pre-commit hook script that ensures type-checking, tests, and fast style checks pass vagrant ssh -c ". activate \ - && echo 'Checking mypy type annotations...' && mypy --no-error-summary . \ - && echo 'Checking if Black would reformat any code...' && black --check . \ - && echo -n 'Running tests: ' && pytest -q -m 'not html_validation' \ - && echo 'Checking SCSS style...' && npm run --silent lint:scss \ - && echo 'Checking JS style...' && npm run --silent lint:js" + && invoke type-checking test --quiet check-code-style" diff --git a/git_hooks/pre-push b/git_hooks/pre-push index e0b2908..5333fa1 100755 --- a/git_hooks/pre-push +++ b/git_hooks/pre-push @@ -1,11 +1,6 @@ #!/bin/sh # -# Pre-push hook script that ensures mypy checks, style checks, and tests pass +# Pre-push hook script that ensures all tests and code checks pass vagrant ssh -c ". activate \ - && echo 'Checking mypy type annotations...' && mypy --no-error-summary . \ - && echo 'Checking if Black would reformat any code...' && black --check . \ - && echo -n 'Running tests: ' && pytest -q -m '' \ - && echo 'Checking SCSS style...' && npm run --silent lint:scss \ - && echo 'Checking JS style...' && npm run --silent lint:js \ - && echo 'Checking Python style fully (takes a while)...' && prospector -M" + && invoke type-checking test --quiet --html-validation check-code-style --full"