ci/cd: update pre-commit hooks and dependencies except pydantic

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.2.0
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         args:
@@ -16,15 +16,15 @@ repos:
           - flake8-bugbear
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0 # need 5.12.0 to fix RuntimeError: The Poetry configuration is invalid
+    rev: 5.13.2 # need 5.12.0 to fix RuntimeError: The Poetry configuration is invalid
     hooks:
       - id: isort
         args:
           - --multi-line=3
           - --profile=black # to be compatible with black
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: check-yaml
@@ -33,14 +33,46 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.4
+    rev: v2.2.6
     hooks:
       - id: codespell
+        exclude: ^config/
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
+        args: [--py310-plus]
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.8.0
+    hooks:
+      - id: mypy
+        args:
+          - src
+          - tests
+        pass_filenames: false
+        additional_dependencies:
+          - pydantic==1.10.8
+          - pytest
+          - rich
+          - typer
+          - types-PyYAML
+
+  - repo: https://github.com/nbQA-dev/nbQA
+    rev: 1.7.1
+    hooks:
+      - id: nbqa-black
+        # additional_dependencies: [jupytext]  # optional, only if you're using Jupytext
+      - id: nbqa-pyupgrade
+        args: [--py310-plus]
+      - id: nbqa-isort
+        args: [--float-to-top, --profile=black]
+
+  - repo: https://github.com/kynan/nbstripout
+    rev: 0.7.1
+    hooks:
+      - id: nbstripout
 
   - repo: local
     hooks:
@@ -59,19 +91,6 @@ repos:
         entry: pdm lock --check
         language: system
         pass_filenames: false
-      - id: mypy
-        name: mypy
-        entry: |
-          bash -c "
-          if git diff --name-only --cached --diff-filter=ACM | grep -q '\.py$'; then
-            pdm run mypy $(git diff --name-only --cached --diff-filter=ACM | grep '\.py$');
-          elif git diff --name-only --cached --diff-filter=ACM | grep -q . ; then
-            echo 'No staged .py files, skipping...';
-          else
-            find src -name '*.py' -exec pdm run mypy {} +;
-          fi"
-        language: system
-        pass_filenames: false
       - id: pytest-check
         name: pytest-check
         entry: pdm run pytest

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help vscode-settings setup update-dev update-user run project-help test pre-commit clean
+.PHONY: help vscode-settings setup update-dev update-user run docker-build docker-run docker docker-logs docker-stop docker-kill project-help test pre-commit clean
 
 help:  ## Show this help message for each Makefile recipe
 ifeq ($(OS),Windows_NT)
@@ -12,7 +12,7 @@ setup:  ## Setup project
 	pdm run pre-commit install
 
 update-dev:  ## Update project dependencies for development
-	pdm update
+	pdm update --skip pydantic
 	pdm run pre-commit autoupdate
 	make test
 

pyproject.toml

@@ -8,7 +8,7 @@ authors = [
 dependencies = [
     "pdm>=2.5.3",
     "pyyaml>=6.0",
-    "pydantic>=1.10.5",
+    "pydantic==1.10.8",
     "typer>=0.7.0",
 ]
 requires-python = ">=3.9"
@@ -19,8 +19,6 @@ license = {text = "MIT"}
 [tool.pdm.dev-dependencies]
 workflow = [
     "pre-commit>=3.0.4",
-    "mypy>=1.2.0",
-    "types-PyYAML>=6.0.12.9",
 ]
 test = [
     "pytest>=7.2.1",

requirements.txt

@@ -1,11 +1,9 @@
 # This file is @generated by PDM.
 # Please do not edit it manually.
 
-mypy>=1.2.0
 pdm>=2.5.3
 pre-commit>=3.0.4
-pydantic>=1.10.5
+pydantic==1.10.8
 pytest>=7.2.1
 pyyaml>=6.0
 typer>=0.7.0
-types-PyYAML>=6.0.12.9

src/gale_shapley/algorithm.py

@@ -94,11 +94,13 @@ def print_all_preferences(self, compact: bool = True) -> None:
             for i in range(len(first_column)):
                 data.append(
                     [
-                        person.preferences[i].name
-                        if bool(person.preferences)
-                        and i < len(person.preferences)
-                        and person.is_acceptable(person.preferences[i])
-                        else ""
+                        (
+                            person.preferences[i].name
+                            if bool(person.preferences)
+                            and i < len(person.preferences)
+                            and person.is_acceptable(person.preferences[i])
+                            else ""
+                        )
                         for person in self.persons
                     ]
                 )

src/gale_shapley/config.py

@@ -31,9 +31,9 @@ class YAMLConfig(BaseModel):
     number_of_proposers: int
     number_of_responders: int
     log_file_name: str
-    proposers: dict[
-        str, list[str]
-    ] = {}  # mutable default values are fine, pydantic takes care of it
+    proposers: dict[str, list[str]] = (
+        {}
+    )  # mutable default values are fine, pydantic takes care of it
     responders: dict[str, list[str]] = {}
 
     @validator("proposer_side_name", "responder_side_name")

src/gale_shapley/simulator.py

@@ -155,9 +155,9 @@ def blocking_pairs(self) -> list[tuple[Proposer, Responder]]:
         blocking: list[tuple[Proposer, Responder]] = []
         for proposer in self.proposers:  # looping one side is enough
             if bool(proposer.preferences) and proposer.is_matched:
-                better_than_match_of_proposer: tuple[
-                    Proposer | Responder, ...
-                ] = proposer.preferences[: proposer.preferences.index(proposer.match)]
+                better_than_match_of_proposer: tuple[Proposer | Responder, ...] = (
+                    proposer.preferences[: proposer.preferences.index(proposer.match)]
+                )
                 for responder in better_than_match_of_proposer:
                     if isinstance(
                         responder, Responder

src/gale_shapley/utils.py

@@ -1,9 +1,10 @@
 """Module for utility functions."""
 
 import logging
+from collections.abc import Callable
 from pathlib import Path
 from time import time
-from typing import Callable, TypeVar
+from typing import TypeVar
 
 from rich.logging import RichHandler
 from typing_extensions import (

tests/conftest.py

@@ -1,6 +1,6 @@
 import logging
 import random
-from typing import Generator
+from collections.abc import Generator
 
 import pytest