Replace pyright with pre-commit

Signed-off-by: Tobias Wolf <[email protected]>
On-behalf-of: SAP <[email protected]>

Author: NotTheEvilOne

.pre-commit-config.ruff.yaml

@@ -0,0 +1,7 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.5
+    hooks:
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format

.pre-commit-config.yaml

@@ -0,0 +1,27 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.5
+    hooks:
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: check-yaml
+        args: [ --allow-multiple-documents ]
+      - id: check-json
+      - id: check-toml
+      - id: check-merge-conflict
+      - id: mixed-line-ending
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v1.18.2'
+    hooks:
+    -   id: mypy
+        args: [--strict, --ignore-missing-imports, --check-untyped-defs]
+        additional_dependencies:
+          - types-click
+          - types-PyYAML
+          - types-requests

Makefile

@@ -8,7 +8,7 @@ help:
 	@echo "  install      - Install the package and dependencies"
 	@echo "  install-dev  - Install the package and dev dependencies"
 	@echo "  test         - Run tests"
-	@echo "  format       - Format code with black"
+	@echo "  format       - Format code with ruff"
 	@echo "  lint         - Run linting checks"
 	@echo "  security     - Run security checks with bandit"
 	@echo "  docs         - Build the documentation"
@@ -59,24 +59,19 @@ test-trace: install-test
 	$(POETRY) run pytest -k "not kms" -vvv --log-cli-level=DEBUG
 
 format: install-dev
-	$(POETRY) run black --extend-exclude test-data/gardenlinux .
+	$(POETRY) run -c .pre-commit-config.ruff.yaml --all-files
 
 lint: install-dev
-	@echo
-	@echo "------------------------------------------------------------------------------------------------------------------------"
-	@echo "--// BLACK //-----------------------------------------------------------------------------------------------------------"
-	@echo "------------------------------------------------------------------------------------------------------------------------"
-	$(POETRY) run black --diff --extend-exclude test-data/gardenlinux .
 	@echo
 	@echo "------------------------------------------------------------------------------------------------------------------------"
 	@echo "--// ISORT //-----------------------------------------------------------------------------------------------------------"
 	@echo "------------------------------------------------------------------------------------------------------------------------"
 	$(POETRY) run isort --check-only .
 	@echo
 	@echo "------------------------------------------------------------------------------------------------------------------------"
-	@echo "--// PYRIGHT //---------------------------------------------------------------------------------------------------------"
+	@echo "--// PRE-COMMIT //------------------------------------------------------------------------------------------------------"
 	@echo "------------------------------------------------------------------------------------------------------------------------"
-	$(POETRY) run pyright
+	$(POETRY) run pre-commit run --all-files
 
 security: install-dev
 	@if [ "$(CI)" = "true" ]; then \

docs/index.rst

@@ -26,4 +26,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

hack/print_feature_extensions.sh

@@ -3,14 +3,14 @@
 
 search_and_print_directories() {
     local pattern="$1"
-    local base_pattern="${pattern%%.*}" 
-    
+    local base_pattern="${pattern%%.*}"
+
     while IFS= read -r file; do
         dir=$(dirname "$file" | sed 's|^\./||')
-        
+
         suffix="${file##*/}"
-        suffix="${suffix#"$base_pattern"}" 
-        
+        suffix="${suffix#"$base_pattern"}"
+
         echo "('$dir', '$suffix'),"
     done < <(find . -type f -name "$pattern" | sort -u)
 }

poetry.lock

@@ -10,27 +10,26 @@ packages = [{ include = "gardenlinux", from = "src" }]
 [tool.poetry.dependencies]
 python = ">=3.13"
 apt-repo = "^0.5"
-boto3 = "^1.40.57"
-click = "^8.2.1"
-cryptography = "^46.0.1"
+boto3 = "^1.41.3"
+click = "^8.3.1"
+cryptography = "^46.0.3"
 jsonschema = "^4.25.1"
-networkx = "^3.5"
+networkx = "^3.6"
 oras = "^0.2.38"
 pygit2 = "^1.19.0"
 pygments = "^2.19.2"
 PyYAML = "^6.0.2"
 gitpython = "^3.1.45"
 
 [tool.poetry.group.dev.dependencies]
-bandit = "^1.8.6"
-black = "^25.1.0"
-moto = "^5.1.12"
-python-dotenv = "^1.1.1"
-pytest = "^9.0.0"
+bandit = "^1.9.2"
+moto = "^5.1.16"
+pre-commit = "^4.5.0"
+python-dotenv = "^1.2.1"
+pytest = "^8.4.1"
 pytest-cov = "^7.0.0"
 isort = "^7.0.0"
 requests-mock = "^1.12.1"
-pyright = "^1.1.403"
 
 [tool.poetry.group.docs.dependencies]
 sphinx-rtd-theme = "^3.0.2"
@@ -53,19 +52,6 @@ line_length = 120
 known_first_party = ["gardenlinux"]
 skip = ["test-data", ".venv", "**/__pycache", ".pytest-cache", "hack"]
 
-[tool.pyright]
-typeCheckingMode = "strict"
-venvPath = "."
-venv = ".venv"
-exclude = [
-    "test-data",
-    "docs",
-    "hack",
-    ".venv",
-    ".pytest-cache",
-    "**/__pycache",
-]
-
 [tool.bandit]
 skips = ["B101", "B404"] # allow asserts, subprocesses
 exclude_dirs = ["tests"]

pyproject.toml

@@ -21,7 +21,7 @@ class Debsrc:
                  Apache License, Version 2.0
     """
 
-    def __init__(self, deb_source, deb_version):
+    def __init__(self, deb_source: str, deb_version: str):
         """
         Constructor __init__(Debsrc)
 
@@ -31,8 +31,8 @@ def __init__(self, deb_source, deb_version):
         :since: 0.7.0
         """
 
-        self.deb_source: str = deb_source
-        self.deb_version: str = deb_version
+        self.deb_source = deb_source
+        self.deb_version = deb_version
 
     def __repr__(self) -> str:
         """

pyrightconfig.json

@@ -9,7 +9,7 @@
 from apt_repo import APTRepository
 
 
-class GardenLinuxRepo(APTRepository):
+class GardenLinuxRepo(APTRepository):  # type: ignore[misc]
     """
     Class to reflect APT based GardenLinux repositories.