evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent committing to dev/master/rc directly (#32029)

Browse source 
* Prevent committing to dev/master/rc directly

* Skip pre-commit on version bump
This commit is contained in:
Franck Nijhof 2020-02-20 18:34:30 +01:00 • committed by GitHub
parent 1c81e8ad68
commit b2f2afaf0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
.pre-commit-config.yaml
View file

@ -1,53 +1,58 @@
repos: repos:
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 19.10b0 rev: 19.10b0
hooks: hooks:
- id: black - id: black
args: args:
- --safe - --safe
- --quiet - --quiet
files: ^((homeassistant|script|tests)/.+)?[^/]+\.py$ files: ^((homeassistant|script|tests)/.+)?[^/]+\.py$
- repo: https://github.com/codespell-project/codespell - repo: https://github.com/codespell-project/codespell
rev: v1.16.0 rev: v1.16.0
hooks: hooks:
- id: codespell - id: codespell
args: 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 - --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" - --skip="./.*,*.json"
- --quiet-level=2 - --quiet-level=2
exclude_types: [json] exclude_types: [json]
- repo: https://gitlab.com/pycqa/flake8 - repo: https://gitlab.com/pycqa/flake8
rev: 3.7.9 rev: 3.7.9
hooks: hooks:
- id: flake8 - id: flake8
additional_dependencies: additional_dependencies:
- flake8-docstrings==1.5.0 - flake8-docstrings==1.5.0
- pydocstyle==5.0.2 - pydocstyle==5.0.2
files: ^(homeassistant|script|tests)/.+\.py$ files: ^(homeassistant|script|tests)/.+\.py$
- repo: https://github.com/PyCQA/bandit - repo: https://github.com/PyCQA/bandit
rev: 1.6.2 rev: 1.6.2
hooks: hooks:
- id: bandit - id: bandit
args: args:
- --quiet - --quiet
- --format=custom - --format=custom
- --configfile=tests/bandit.yaml - --configfile=tests/bandit.yaml
files: ^(homeassistant|script|tests)/.+\.py$ 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 rev: v4.3.21
hooks: hooks:
- id: isort - id: isort
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.4.0 rev: v2.4.0
hooks: hooks:
- id: check-json - id: check-json
- repo: local - id: no-commit-to-branch
args:
- --branch=dev
- --branch=master
- --branch=rc
- repo: local
hooks: hooks:
# Run mypy through our wrapper script in order to get the possible # 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 # 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 # committing from a GUI tool that was not launched from an activated
# shell. # shell.
- id: mypy - id: mypy
name: mypy name: mypy
entry: script/run-in-env.sh mypy entry: script/run-in-env.sh mypy
language: script language: script

2
script/gen_requirements_all.py
View file

@ -65,7 +65,7 @@ enum34==1000000000.0.0
pycrypto==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): def has_tests(module: str):

2
script/version_bump.py
View file

@ -140,7 +140,7 @@ def main():
if not arguments.commit: if not arguments.commit:
return 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(): def test_bump_version():