Merge pull request #1152 from EnergySystemsModellingLab/bump-broken-pre-commit-hooks

Update `pre-commit` hooks and add workflow to auto-update them in future

Author: alexdewar

.github/workflows/auto-merge.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Enable auto-merge for bot PRs
         run: |
           gh pr review --approve "$PR_URL"
-          gh pr merge --auto --merge "$PR_URL"
+          gh pr merge --auto --rebase "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           # GitHub provides this variable in the CI env. You don't

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

@@ -0,0 +1,27 @@
+name: Pre-commit auto-update
+
+on:
+  schedule:
+    - cron: 0 0 * * 1 # midnight every Monday
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  auto-update:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@v5
+      - uses: browniebroke/pre-commit-autoupdate-action@1
+      - uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
+          branch: update/pre-commit-hooks
+          title: Update pre-commit hooks
+          commit-message: "chore: update pre-commit hooks"
+          body: Update versions of pre-commit hooks to latest version.

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 exclude: ^schemas/table-schema.json$
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.2
+    rev: 0.37.0
     hooks:
       - id: check-dependabot
       - id: check-github-actions
@@ -31,16 +31,16 @@ repos:
         files: /settings\.toml$
         types_or: [toml]
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.38.0
+    rev: v0.47.0
     hooks:
       - id: markdownlint-fix
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.1.0"
+    rev: "v4.0.0-alpha.8"
     hooks:
       - id: prettier
         types_or: [yaml, json]
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.13.0
+    rev: v2.16.0
     hooks:
       - id: pretty-format-toml
         args: [--autofix, --indent, "4", --no-sort]
@@ -53,19 +53,19 @@ repos:
       - id: clippy
         args: ["--all-targets", "--", "-D", "warnings"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.6
+    rev: v0.15.4
     hooks:
-      - id: ruff
+      - id: ruff-check
         types_or: [python]
         args: [--fix]
       - id: ruff-format
         types_or: [python]
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.8.1
+    rev: 0.9.1
     hooks:
       - id: nbstripout
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.4.1
     hooks:
       - id: codespell
         args: [--ignore-words, .codespell_ignore.txt]

schemas/input/agent_commodity_portions.yaml

@@ -20,7 +20,8 @@ fields:
   - name: years
     type: string
     description: The year(s) to which this entry applies
-    notes: One or more milestone years separated by semicolons, `all` to select all years or a year
+    notes:
+      One or more milestone years separated by semicolons, `all` to select all years or a year
       range in the form 'start..end' to select all valid years within range, inclusive. Either 'start'
       'end' or both can be omitted, which will set the corresponding limit to the minimum or maximum
       valid year, respectively.

schemas/input/agent_objectives.yaml

@@ -16,7 +16,8 @@ fields:
   - name: years
     type: string
     description: The year(s) to which this entry applies
-    notes: One or more milestone years separated by semicolons, `all` to select all years or a year
+    notes:
+      One or more milestone years separated by semicolons, `all` to select all years or a year
       range in the form 'start..end' to select all valid years within range, inclusive. Either 'start'
       'end' or both can be omitted, which will set the corresponding limit to the minimum or maximum
       valid year, respectively.

schemas/input/agent_search_space.yaml

@@ -16,7 +16,8 @@ fields:
   - name: years
     type: string
     description: The year(s) to which this entry applies
-    notes: One or more milestone years separated by semicolons, `all` to select all years or a year
+    notes:
+      One or more milestone years separated by semicolons, `all` to select all years or a year
       range in the form 'start..end' to select all valid years within range, inclusive. Either 'start'
       'end' or both can be omitted, which will set the corresponding limit to the minimum or maximum
       valid year, respectively.

schemas/input/commodity_levies.yaml

@@ -20,7 +20,8 @@ fields:
   - name: years
     type: string
     description: The year(s) to which this entry applies
-    notes: One or more milestone years separated by semicolons, `all` to select all years or a year
+    notes:
+      One or more milestone years separated by semicolons, `all` to select all years or a year
       range in the form 'start..end' to select all valid years within range, inclusive. Either 'start'
       'end' or both can be omitted, which will set the corresponding limit to the minimum or maximum
       valid year, respectively.

schemas/input/demand.yaml

@@ -17,7 +17,8 @@ fields:
   - name: year
     type: string
     description: The year(s) to which this entry applies
-    notes: One or more milestone years separated by semicolons, `all` to select all years or a year
+    notes:
+      One or more milestone years separated by semicolons, `all` to select all years or a year
       range in the form 'start..end' to select all valid years within range, inclusive. Either 'start'
       'end' or both can be omitted, which will set the corresponding limit to the minimum or maximum
       valid year, respectively.

schemas/input/process_availabilities.yaml

@@ -22,7 +22,8 @@ fields:
   - name: years
     type: string
     description: The milestone year(s) to which this entry applies
-    notes: One or more milestone years separated by semicolons, `all` to select all years or a year
+    notes:
+      One or more milestone years separated by semicolons, `all` to select all years or a year
       range in the form 'start..end' to select all valid years within range, inclusive. Either 'start'
       'end' or both can be omitted, which will set the corresponding limit to the minimum or maximum
       valid year, respectively.

schemas/input/process_flows.yaml

@@ -23,7 +23,8 @@ fields:
   - name: years
     type: string
     description: The year(s) to which this entry applies
-    notes: One or more milestone years separated by semicolons, `all` to select all years or a year
+    notes:
+      One or more milestone years separated by semicolons, `all` to select all years or a year
       range in the form 'start..end' to select all valid years within range, inclusive. Either 'start'
       'end' or both can be omitted, which will set the corresponding limit to the minimum or maximum
       valid year, respectively.