Merge pull request #9 from remerge/update-template

Update template

.ansible-lint

@@ -1,4 +1,6 @@
 ---
+profile: production
+
 exclude_paths:
   - .ansible/collections
   - .ansible/roles

.copier-answers.yml

@@ -1,10 +1,11 @@
 ---
 # Changes here will be overwritten by Copier
-_commit: v2.0.1
+_commit: v2.1.3
 _src_path: gh:remerge/template
 project_id: ansible-role-zfs
 project_license: apache-2.0
 project_name: Ansible Role for ZFS
 project_owner: core
 project_type: ansible-role
+run_workflows_for_all_branches: false
 use_python: true

.envrc

@@ -15,6 +15,9 @@ dotenv_if_exists
 # Add local scripts to PATH
 PATH_add "${PWD}/bin"
 
+# Enforce correct 1Password account
+export OP_ACCOUNT=remerge.1password.com
+
 # Disable macOS fork safety for Python compatibility
 # https://docs.ansible.com/ansible/latest/reference_appendices/faq.html#running-on-macos
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES

.pre-commit-config.yaml

@@ -33,14 +33,14 @@ repos:
 
   # https://github.com/pre-commit/mirrors-prettier/tags
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0"
+    rev: "v3.0.3"
     hooks:
       - id: prettier
         exclude: "^project/"
 
   # https://github.com/igorshubovych/markdownlint-cli/tags
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: "v0.35.0"
+    rev: "v0.37.0"
     hooks:
       - id: markdownlint-fix
         name: markdownlint
@@ -67,14 +67,14 @@ repos:
 
   # https://github.com/rhysd/actionlint/tags
   - repo: https://github.com/rhysd/actionlint
-    rev: "v1.6.25"
+    rev: "v1.6.26"
     hooks:
       - id: actionlint-docker
         name: actionlint
 
   # https://github.com/ansible/ansible-lint/tags
   - repo: https://github.com/ansible/ansible-lint
-    rev: "v6.17.2"
+    rev: "v6.20.0"
     hooks:
       - id: ansible-lint
         name: ansible-lint
@@ -96,7 +96,7 @@ repos:
 
   # https://github.com/bridgecrewio/checkov/tags
   - repo: https://github.com/bridgecrewio/checkov
-    rev: "2.3.340"
+    rev: "2.4.48"
     hooks:
       - id: checkov
         name: checkov

.vscode/settings.json

@@ -9,6 +9,9 @@
   },
   "python.defaultInterpreterPath": ".venv/bin/python",
   "ansible.python.interpreterPath": ".venv/bin/python",
+  "yaml.schemas": {
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible.json": "playbooks/inventory.yaml"
+  },
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },

CONTRIBUTING.md

@@ -38,3 +38,7 @@ brew install --cask docker
 brew install pre-commit pipx direnv copier
 brew install poetry
 ```
+
+Once `pre-commit` hook is activated (`make pre-commit-install`),
+set of formatting and linting routines is run automatically on each commit.
+The step could be avoided by providing `--no-verify` flag for `git commit`.

Makefile

@@ -82,17 +82,12 @@ update:: copier-update
 
 ## pre-commit
 
-.git/hooks/pre-commit:
-	make pre-commit-install
-
 .PHONY: pre-commit-install
 pre-commit-install: ## install pre-commit hook
 	pre-commit install -t pre-commit -t prepare-commit-msg -t commit-msg
-install:: pre-commit-install
 
 .PHONY: pre-commit-check
 pre-commit-check: ## run pre commit hooks
-pre-commit-check: .git/hooks/pre-commit
 	pre-commit run --all-files
 check:: pre-commit-check
 

pyproject.toml

@@ -8,13 +8,13 @@ authors = ["Remerge GmbH <[email protected]>"]
 python = "^3.9"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.7.0"
-flake8 = "^6.0.0"
-flake8-bugbear = "^23.7.10"
-pylint = "^2.17.4"
-tox = "^4.6.4"
-molecule = { extras = ["docker"], version = "^5.1.0" }
-ansible-lint = { version = "^6.17.2", markers = "platform_system != 'Windows'" }
+black = "^23.9.1"
+flake8 = "^6.1.0"
+flake8-bugbear = "^23.9.16"
+pylint = "^2.17.5"
+tox = "^4.11.3"
+molecule = { extras = ["docker"], version = "^6.0.2" }
+ansible-lint = { version = "^6.20.0", markers = "platform_system != 'Windows'" }
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]