Merge pull request #358 from ImperialCollegeLondon/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: github-actions[bot]

.pre-commit-config.yaml

@@ -5,33 +5,33 @@ repos:
       - id: check-merge-conflict
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.8.3"
+    rev: "v0.9.10"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.13.0"
+    rev: "v1.15.0"
     hooks:
       - id: mypy
         additional_dependencies:
           [types-requests, types-PyYAML]
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.43.0
+    rev: v0.44.0
     hooks:
       - id: markdownlint
         args: ["--disable", "MD013", "--disable", "MD025", "--"]
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
     - id: codespell
       name: Check common misspellings in text files with codespell.
       additional_dependencies:
       - tomli
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.5.0
+    rev: v2.5.1
     hooks:
     - id: pyproject-fmt
       name: Apply a consistent format to pyproject.toml

pyproject.toml

@@ -114,7 +114,7 @@ lint.pydocstyle.convention = "google"
 
 [tool.codespell]
 skip = "src/swmmanywhere/defs/iso_converter.yml,*.inp,docs/paper/*"
-ignore-words-list = "gage,gages,Carrer"
+ignore-words-list = "gage,gages,Carrer,anc"
 
 [tool.pytest.ini_options]
 addopts = "-v --cov=src/swmmanywhere --cov-report=xml --doctest-modules --ignore=src/swmmanywhere/logging.py"

src/netcomp/distance/exact.py

@@ -192,8 +192,7 @@ def lambda_dist(A1, A2, k=None, p=2, kind="laplacian"):
         evals1, evals2 = [evals[::-1] for evals in [evals1, evals2]]
     else:
         raise InputError(
-            "Invalid type, choose from 'laplacian', "
-            "'laplacian_norm', and 'adjacency'."
+            "Invalid type, choose from 'laplacian', 'laplacian_norm', and 'adjacency'."
         )
     dist = la.norm(evals1[:k] - evals2[:k], ord=p)
     return dist

src/netcomp/linalg/resistance.py

@@ -71,7 +71,7 @@ def resistance_matrix(A, check_connected=True):
             G = nx.from_numpy_array(A)
         if not nx.is_connected(G):
             raise UndefinedException(
-                "Graph is not connected. " "Resistance matrix is undefined."
+                "Graph is not connected. Resistance matrix is undefined."
             )
     L = laplacian_matrix(A)
     with suppress(Exception):

src/swmmanywhere/swmmanywhere.py

@@ -88,7 +88,7 @@ def swmmanywhere(config: dict) -> tuple[Path, dict | None]:
     logger.info(f"Project structure created at {addresses.project_paths.base_dir}")
     logger.info(f"Project name: {config['project']}")
     logger.info(
-        f"""Bounding box: {config['bbox']}, 
+        f"""Bounding box: {config["bbox"]}, 
                 number: {addresses.bbox_paths.bbox_number}"""
     )
     logger.info(f"Model number: {addresses.model_paths.model_number}")
@@ -279,7 +279,7 @@ def check_starting_graph(config: dict):
     if not config["starting_graph"].exists():
         raise FileNotFoundError(
             f"""starting_graph not found at 
-                                {config['starting_graph']}"""
+                                {config["starting_graph"]}"""
         )
 
     return config

tests/test_swmmanywhere.py

@@ -98,7 +98,7 @@ def test_swmmanywhere(run):
         assert set(metrics.keys()) == set(config["metric_list"])
 
         # Check results were saved
-        assert (inp.parent / f'{config["graphfcn_list"][-1]}_graph.json').exists()
+        assert (inp.parent / f"{config['graphfcn_list'][-1]}_graph.json").exists()
         assert inp.exists()
         assert (inp.parent / "results.parquet").exists()
         assert (config["real"]["inp"].parent / "real_results.parquet").exists()