Merge pull request #62 from csdms/mcflugen/update-linters

Update the linters

Author: mcflugen

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: 23.12.1
+  rev: 24.10.0
   hooks:
   - id: black
     name: black
@@ -23,7 +23,7 @@ repos:
     additional_dependencies: [".[jupyter]"]
 
 - repo: https://github.com/pycqa/flake8
-  rev: 7.0.0
+  rev: 7.1.1
   hooks:
   - id: flake8
     additional_dependencies:
@@ -42,19 +42,21 @@ repos:
     language: python
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.0
+  rev: v3.19.1
   hooks:
   - id: pyupgrade
     args: [--py310-plus]
 
-- repo: https://github.com/asottile/reorder-python-imports
-  rev: v3.12.0
+- repo: https://github.com/PyCQA/isort
+  rev: 5.13.2
   hooks:
-  - id: reorder-python-imports
-    args: [--py310-plus, --add-import, "from __future__ import annotations"]
+  - id: isort
+    name: isort (python)
+    args: [--add-import, "from __future__ import annotations"]
+    types: [python]
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v5.0.0
   hooks:
     - id: check-builtin-literals
     - id: check-added-large-files
@@ -86,9 +88,8 @@ repos:
     additional_dependencies: [".[toml]"]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.8.0
+  rev: v1.14.1
   hooks:
   - id: mypy
     language_version: python3.12
-    additional_dependencies: [types-all]
     files: src/.*\.py$

pyproject.toml

@@ -65,6 +65,11 @@ where = [
 [tool.coverage.run]
 relative_files = true
 
+[tool.isort]
+known_first_party = "bmipy"
+profile = "black"
+force_single_line = true
+
 [tool.mypy]
 check_untyped_defs = true
 disallow_any_generics = true

setup.cfg

@@ -1,6 +1,4 @@
 [flake8]
-exclude = docs, build, .nox
-ignore = C901, E203, E266, E501, W503, B905
+exclude = build, .nox
 max-line-length = 88
-max-complexity = 18
-select = B,C,E,F,W,T4,B9
+max-complexity = 10

src/bmipy/__init__.py

@@ -1,4 +1,5 @@
 """The Basic Model Interface (BMI) for Python."""
+
 from __future__ import annotations
 
 from bmipy._version import __version__

src/bmipy/__main__.py

@@ -1,4 +1,5 @@
 """The bmipy-render command."""
+
 from __future__ import annotations
 
 from bmipy._cmd import main

src/bmipy/_cmd.py

@@ -1,4 +1,5 @@
 """Command line interface that create template BMI implementations."""
+
 from __future__ import annotations
 
 import argparse

src/bmipy/_template.py

@@ -4,8 +4,8 @@
 import os
 import re
 import textwrap
-from collections import defaultdict
 from collections import OrderedDict
+from collections import defaultdict
 
 from bmipy.bmi import Bmi
 

src/bmipy/bmi.py

@@ -3,6 +3,7 @@
 This language specification is derived from the Scientific Interface
 Definition Language (SIDL) file `bmi.sidl <https://github.com/csdms/bmi>`_.
 """
+
 from __future__ import annotations
 
 from abc import ABC

tests/cli_test.py

@@ -1,24 +1,23 @@
 from __future__ import annotations
 
+import contextlib
+
 import pytest
+
 from bmipy._cmd import main
 
 
 def test_cli_version(capsys):
-    try:
+    with contextlib.suppress(SystemExit):
         assert main(["--version"]) == 0
-    except SystemExit:
-        pass
     output = capsys.readouterr().out
 
     assert "bmipy" in output
 
 
 def test_cli_help(capsys):
-    try:
+    with contextlib.suppress(SystemExit):
         assert main(["--help"]) == 0
-    except SystemExit:
-        pass
     output = capsys.readouterr().out
 
     assert "help" in output

tests/template_test.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import pytest
+
 from bmipy._template import dedent_docstring
 from bmipy._template import render_function_signature