OPT: Use ruff latest and mypy

kpn · Apr 25, 2024 · d89f25e · d89f25e
1 parent 820667e
commit d89f25e
Show file tree

Hide file tree

Showing 6 changed files with 298 additions and 332 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,8 +22,8 @@ commitizen = "^3.8.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.2.2"
-black = "^23.3.0"
-ruff = "^0.0.262"
+ruff = "^0.4.0"
+mypy = "^1.10.0"
 
 [build-system]
 requires = ["poetry-core"]
@@ -32,3 +32,13 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.plugins."commitizen.plugin"]
 cz_kpn = "cz_kpn:KPNCz"
+
+[tool.ruff.lint.isort]
+known-first-party = ["cz_kpn", "tests"]
+
+[tool.ruff.lint]
+select = ["I"]
+
+[tool.mypy]
+mypy_path = "src"
+ignore_missing_imports = true
diff --git a/scripts/format b/scripts/format
@@ -7,7 +7,7 @@ fi
 
 set -x
 
-${PREFIX}black cz_kpn tests
-${PREFIX}ruff cz_kpn tests --fix
+${PREFIX}ruff format src tests
+${PREFIX}ruff check src tests --fix
 
 
diff --git a/scripts/lint b/scripts/lint
@@ -5,6 +5,6 @@ if [ -d '.venv' ] ; then
     export PREFIX=".venv/bin/"
 fi
 
-${PREFIX}black cz_kpn tests --check --diff
-${PREFIX}ruff cz_kpn/ tests/
-${PREFIX}mypy cz_kpn/ tests
+${PREFIX}ruff check src/ tests/
+${PREFIX}ruff format --check src/ tests/
+${PREFIX}mypy src/ tests
diff --git a/src/cz_kpn/consts.py b/src/cz_kpn/consts.py
@@ -21,4 +21,4 @@
 )
 
 BUMP_PATTERN = r"^(NEW|CHANGE|FIX|OPT|BREAK)"
-COMMIT_PARSER = r"^(?P<change_type>NEW|CHANGE|FIX|OPT|BREAK)(?:\((?P<scope>[^()\r\n]*)\)|\()?:?\s(?P<message>.+)"  # noqa
+COMMIT_PARSER = r"^(?P<change_type>NEW|CHANGE|FIX|OPT|BREAK)(?:\((?P<scope>[^()\r\n]*)\)|\()?:?\s(?P<message>.+)"  # noqa
diff --git a/tests/test_commit_parser.py b/tests/test_commit_parser.py
@@ -1,4 +1,5 @@
 import re
+
 import pytest
 
 try: