diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a340aa7ae67..7d55224c335 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,53 +1,58 @@ repos: -- repo: https://github.com/psf/black + - repo: https://github.com/psf/black rev: 19.10b0 hooks: - - id: black + - id: black args: - --safe - --quiet files: ^((homeassistant|script|tests)/.+)?[^/]+\.py$ -- repo: https://github.com/codespell-project/codespell + - repo: https://github.com/codespell-project/codespell rev: v1.16.0 hooks: - - id: codespell + - id: codespell args: - --ignore-words-list=hass,alot,datas,dof,dur,farenheit,hist,iff,ines,ist,lightsensor,mut,nd,pres,referer,ser,serie,te,technik,ue,uint,visability,wan,wanna,withing - --skip="./.*,*.json" - --quiet-level=2 exclude_types: [json] -- repo: https://gitlab.com/pycqa/flake8 + - repo: https://gitlab.com/pycqa/flake8 rev: 3.7.9 hooks: - - id: flake8 + - id: flake8 additional_dependencies: - flake8-docstrings==1.5.0 - pydocstyle==5.0.2 files: ^(homeassistant|script|tests)/.+\.py$ -- repo: https://github.com/PyCQA/bandit + - repo: https://github.com/PyCQA/bandit rev: 1.6.2 hooks: - - id: bandit + - id: bandit args: - --quiet - --format=custom - --configfile=tests/bandit.yaml files: ^(homeassistant|script|tests)/.+\.py$ -- repo: https://github.com/pre-commit/mirrors-isort + - repo: https://github.com/pre-commit/mirrors-isort rev: v4.3.21 hooks: - - id: isort -- repo: https://github.com/pre-commit/pre-commit-hooks + - id: isort + - repo: https://github.com/pre-commit/pre-commit-hooks rev: v2.4.0 hooks: - - id: check-json -- repo: local + - id: check-json + - id: no-commit-to-branch + args: + - --branch=dev + - --branch=master + - --branch=rc + - repo: local hooks: - # Run mypy through our wrapper script in order to get the possible - # pyenv and/or virtualenv activated; it may not have been e.g. if - # committing from a GUI tool that was not launched from an activated - # shell. - - id: mypy + # Run mypy through our wrapper script in order to get the possible + # pyenv and/or virtualenv activated; it may not have been e.g. if + # committing from a GUI tool that was not launched from an activated + # shell. + - id: mypy name: mypy entry: script/run-in-env.sh mypy language: script diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 1bf9031a536..457c14b3474 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -65,7 +65,7 @@ enum34==1000000000.0.0 pycrypto==1000000000.0.0 """ -IGNORE_PRE_COMMIT_HOOK_ID = ("check-json",) +IGNORE_PRE_COMMIT_HOOK_ID = ("check-json", "no-commit-to-branch") def has_tests(module: str): diff --git a/script/version_bump.py b/script/version_bump.py index 13dfe499f5e..f3ed5e99c55 100755 --- a/script/version_bump.py +++ b/script/version_bump.py @@ -140,7 +140,7 @@ def main(): if not arguments.commit: return - subprocess.run(["git", "commit", "-am", f"Bumped version to {bumped}"]) + subprocess.run(["git", "commit", "-nam", f"Bumped version to {bumped}"]) def test_bump_version():