Merge branch 'main' into skip-poetry-in-precommit

Author: colindean

.github/workflows/dependabot-automerge.yaml

@@ -0,0 +1,24 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        # TODO: put this list somewhere more manageable
+        if: contains(fromJSON('["ruff", "mypy", "pytest", "ansi2html", "lxml", "jinja2"]'), steps.metadata.outputs.dependency-names) && steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/make-based-ci.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ "main" ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   poetry-checks:
     runs-on: ubuntu-latest

.github/workflows/pre-commit-updates.yml

@@ -19,10 +19,11 @@ jobs:
         env:
           SKIP: "Reset Poetry Project Version to 0.0.0"
 
-      - uses: peter-evans/create-pull-request@v6
+      - uses: peter-evans/create-pull-request@v7
         if: always()
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          sign-commits: true
           branch: update/pre-commit-hooks
           delete-branch: true
           labels: dependencies

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   -   repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.6.0
+      rev: v5.0.0
       hooks:
         - id: trailing-whitespace
         - id: end-of-file-fixer
@@ -25,7 +25,7 @@ repos:
 
   # Prevent old Pythonisms
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.17.0
     hooks:
     - id: pyupgrade
 

Makefile

@@ -83,7 +83,7 @@ PYTEST ?= $(POETRY) run pytest
 
 .PHONY: help
 help: ## Display this help
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 .PHONY: debug-make
 debug-make: ## Shows ~all runtime-set variables

poetry.lock

@@ -38,7 +38,7 @@ pytest-cov = "*"
 # opinionated code formatter
 black = ">=22"
 # type hints checker
-mypy = "*"
+mypy = { version = "*", extras = ["faster-cache"] }
 # xml library, used for outputting HTML reports from mypy, etc.
 lxml = "*"
 # lightning fast linter and style checker