From 6345f0e8a6e8bdd719a0fc9e7356a00b5de17bba Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Sun, 27 Dec 2020 21:00:38 +0200 Subject: [PATCH] pre-commit. Use a merge of the Python and shell pre-commit snippets. Address the mdformat formatting. --- .pre-commit-config.yaml | 37 ++++++++++++++++++++----------------- README.md | 28 +++++++++++++++------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4e6b33..af9f268 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,40 +1,39 @@ -# vim:ff=unix ts=2 sw=2 ai expandtab --- repos: - - repo: https://github.com/pre-commit/pre-commit-hooks.git + - repo: https://github.com/pre-commit/pre-commit-hooks rev: v3.4.0 hooks: - - id: check-added-large-files - id: check-executables-have-shebangs - id: check-merge-conflict - id: check-symlinks exclude: >- myclirc|netrc|packet-cli|mycli-history|scwrc|gcloud\.json|\.envrc\.private - - id: detect-private-key + - id: check-toml + files: Pipfile - id: trailing-whitespace - - repo: https://github.com/ambv/black.git - rev: 20.8b1 - hooks: - - id: black - exclude: &excluded_pythonscripts pythonrc.py|rabbitmqadmin - args: - - | - --line-length=79 - - - repo: https://github.com/adrienverge/yamllint.git + - repo: https://github.com/adrienverge/yamllint rev: v1.25.0 hooks: - id: yamllint - - repo: https://github.com/amperser/proselint.git + - repo: https://github.com/amperser/proselint/ rev: 0.10.2 hooks: - id: proselint types: [plain-text] exclude: LICENSE - - repo: https://github.com/PyCQA/prospector.git + - repo: https://github.com/ambv/black + rev: 20.8b1 + hooks: + - id: black + exclude: &excluded_pythonscripts pythonrc.py|rabbitmqadmin + args: + - | + --line-length=79 + + - repo: https://github.com/PyCQA/prospector rev: 1.3.1 hooks: - id: prospector @@ -73,7 +72,6 @@ repos: additional_dependencies: - flake8-bugbear - - repo: https://github.com/Yelp/detect-secrets.git rev: v0.14.3 hooks: @@ -100,3 +98,8 @@ repos: name: Shellcheck .bashrc files: \.bashrc types: [text] + + - repo: https://github.com/executablebooks/mdformat.git + rev: 0.5.3 + hooks: + - id: mdformat diff --git a/README.md b/README.md index 219b773..40131af 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,17 @@ mass consumption as it is. *WARNING: This will overwrite your existing files.* - cd - git init - git remote add origin https://git.shore.co.il/nimrod/rcfiles.git/ - git fetch - git reset --hard origin/master - git branch --set-upstream-to=origin/master - git bull - Documents/bin/install-git-hooks - .githooks/post-merge +``` +cd +git init +git remote add origin https://git.shore.co.il/nimrod/rcfiles.git/ +git fetch +git reset --hard origin/master +git branch --set-upstream-to=origin/master +git bull +Documents/bin/install-git-hooks +.githooks/post-merge +``` ## Dependencies @@ -41,7 +43,7 @@ This software is licensed under the MIT license (see `LICENSE.txt`). ## Author Information -Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my [website]( -https://www.shore.co.il/). Patches are welcome via [`git send-email`]( -http://git-scm.com/book/en/v2/Git-Commands-Email). The repository is located -at: <https://git.shore.co.il/nimrod/>. +Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my +[website](https://www.shore.co.il/). Patches are welcome via +[`git send-email`](http://git-scm.com/book/en/v2/Git-Commands-Email). The repository +is located at: <https://www.shore.co.il/git/>. -- GitLab