Merge pull request #58 from E3SM-Project/update-pre-commit-deps

Update pre-commit and its dependencies

Author: forsyth2

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 exclude: "docs|node_modules|migrations|.git|.tox"
-default_stages: [commit]
+default_stages: [pre-commit]
 fail_fast: true
 
 # make sure these always match dev.yml and qa in pyproject.toml
 # (run `python scripts/sync_pre_commit_versions.py` to sync them)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -15,13 +15,13 @@ repos:
 
   # Can run individually with `pre-commit run black --all-files`
   - repo: https://github.com/psf/black
-    rev: 25.1.0
+    rev: 26.5.1
     hooks:
       - id: black
 
   # Can run individually with `pre-commit run isort --all-files`
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.1
+    rev: 8.0.1
     hooks:
       - id: isort
 
@@ -37,7 +37,7 @@ repos:
 
   # Can run individually with `pre-commit run mypy --all-files`
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.2
+    rev: v2.3.0
     hooks:
       - id: mypy
         args: ["--config=pyproject.toml"]

conda/dev.yml

@@ -42,10 +42,10 @@ dependencies:
   # `.pre-commit-config.yaml`, then run
   # `python scripts/sync_pre_commit_versions.py` to update the pinned versions
   # here and in the `qa` extra of pyproject.toml.
-  - black ==25.1.0
+  - black ==26.5.1
   - flake8 ==7.3.0
-  - isort ==6.0.1
-  - mypy ==1.18.2
+  - isort ==8.0.1
+  - mypy ==2.3.0
   - pre-commit ==4.3.0
   - types-PyYAML >=6.0.0
   # Developer Tools

pyproject.toml

@@ -47,11 +47,11 @@ docs = [
 # make sure these always match dev.yml and .pre-commit-config.yaml
 # (run `python scripts/sync_pre_commit_versions.py` to sync them)
 qa = [
-    "black==25.1.0",
+    "black==26.5.1",
     "flake8==7.3.0",
     "flake8-isort==6.1.1",
-    "isort==6.0.1",
-    "mypy==1.18.2",
+    "isort==8.0.1",
+    "mypy==2.3.0",
     "pre-commit==4.3.0",
     "types-PyYAML >=6.0.0",
 ]
@@ -61,6 +61,15 @@ dev = [
     "ipykernel",
 ]
 
+# `pre-commit-update` rewrites .pre-commit-config.yaml with ruamel.yaml.  Without
+# this, it defaults to `indent(sequence=4)`, which puts the `-` of each list item
+# in column 0 and reformats the whole file.  These settings keep its output in
+# the conventional `  - item` style, so an update is a diff of just the revs.
+[tool.pre-commit-update.yaml]
+mapping = 2
+sequence = 4
+offset = 2
+
 [tool.black]
 line-length = 88
 target-version = ['py39']