Update template

.copier-answers.yml

@@ -1,6 +1,6 @@
 ---
 # Changes here will be overwritten by Copier
-_commit: v2.2.0
+_commit: v2.2.1-35-ga025e45
 _src_path: gh:remerge/template
 project_id: ansible-role-nomad
 project_license: apache-2.0

.envrc

@@ -10,7 +10,8 @@
 strict_env
 
 # Loads a ".env" file into the current environment
-dotenv_if_exists
+dotenv_if_exists "${PWD}"/../.env
+dotenv_if_exists "${PWD}"/.env
 
 # Add local scripts to PATH
 PATH_add "${PWD}/bin"
@@ -30,6 +31,10 @@ fi
 
 # Load poetry virtual env
 if [[ ! -d "${PWD}/.venv" ]]; then
+    # make sure we use the python currently on PATH
+    poetry env use "$(which python)"
+
+    # link the poetry virtualenv to .venv for other tools to use
     ln -nfs "$(poetry run poetry env info -p)" "${PWD}/.venv"
 fi
 

.github/actionlint.yaml

@@ -0,0 +1,8 @@
+---
+self-hosted-runner:
+  labels:
+    - generic
+    - self-hosted
+    - nomad
+    - docker
+    - default

.pre-commit-config.yaml

@@ -74,7 +74,7 @@ repos:
 
   # https://github.com/ansible/ansible-lint/tags
   - repo: https://github.com/ansible/ansible-lint
-    rev: "v6.21.1"
+    rev: "v6.22.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: "3.0.21"
+    rev: "3.0.24"
     hooks:
       - id: checkov
         name: checkov

pyproject.toml

@@ -5,7 +5,7 @@ description = "Ansible Role for Nomad"
 authors = ["Remerge GmbH <core@remerge.io>"]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.10.1"
@@ -14,7 +14,7 @@ flake8-bugbear = "^23.9.16"
 pylint = "^3.0.2"
 tox = "^4.11.3"
 molecule = { extras = ["docker"], version = "^6.0.2" }
-ansible-lint = { version = "^6.21.1", markers = "platform_system != 'Windows'" }
+ansible-lint = { version = "^6.22.0", markers = "platform_system != 'Windows'" }
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

python.mk

@@ -10,5 +10,6 @@ update:: python-update
 
 .PHONY: python-clean
 python-clean: ## remove current Python virtualenv
-	poetry env remove python
+	poetry env remove python || :
+	rm -rf .venv
 clean:: python-clean