Merge branch 'main' into create-github-release

Author: vivus-ignis

Makefile

@@ -63,6 +63,8 @@ format: install-dev
 
 lint: install-dev
 	$(POETRY) run black --diff --extend-exclude test-data/gardenlinux .
+	$(POETRY) run isort --check-only .
+	$(POETRY) run pyright
 
 security: install-dev
 	@if [ "$(CI)" = "true" ]; then \

poetry.lock

@@ -5,7 +5,7 @@ description = "Contains tools to work with the features directory of gardenlinux
 authors = ["Garden Linux Maintainers <[email protected]>"]
 license = "Apache-2.0"
 readme = "README.md"
-packages = [{include = "gardenlinux", from="src"}]
+packages = [{ include = "gardenlinux", from = "src" }]
 
 [tool.poetry.dependencies]
 python = "^3.13"
@@ -29,6 +29,7 @@ pytest = "^8.4.1"
 pytest-cov = "^7.0.0"
 isort = "^6.0.1"
 requests-mock = "^1.12.1"
+pyright = "^1.1.403"
 
 [tool.poetry.group.docs.dependencies]
 sphinx-rtd-theme = "^3.0.2"
@@ -44,13 +45,29 @@ gl-s3 = "gardenlinux.s3.__main__:main"
 pythonpath = ["src"]
 norecursedirs = "test-data"
 
+[tool.isort]
+profile = "black"
+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"]
 
-[tool.isort]
-known_first_party = "gardenlinux"
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -0,0 +1,27 @@
+{
+    // Pyright is configured in 'strict' mode in pyproject.toml
+    // This file overrides some reports and tones them down to warnings, if they are not critical.
+    // It also turns some up to become warnings or errors.
+    "reportShadowedImports": "warning",
+    "reportImportCycles": "error",
+    "reportOptionalMemberAccess": "warning",
+    "reportOptionalSubscript": "warning",
+    "reportOptionalContextManager": "warning",
+    "reportOptionalCall": "warning",
+    "reportUnusedVariable": "warning",
+    "reportUnusedImport": "warning",
+    "reportUnusedFunction": "warning",
+    "reportUnusedCallResult": "none",
+    "reportUnusedClass": "warning",
+    "reportUnnecessaryCast": "warning",
+    "reportUnnecessaryComparison": "warning",
+    "reportUnnecessaryIsInstance": "warning",
+    "reportUnnecessaryContains": "warning",
+    // Becomes useful after introduction of type annotations
+    // "reportUnknownMemberType": "warning",
+    // "reportUnknownParameterType": "warning",
+    // "reportUnknownArgumentType": "warning",
+    // "reportUnknownVariableType": "warning",
+    "reportTypedDictNotRequiredAccess": "error",
+    "reportDeprecated": "warning",
+}

pyrightconfig.json

@@ -4,9 +4,10 @@
 APT repositories
 """
 
-from apt_repo import APTRepository
 from typing import Optional
 
+from apt_repo import APTRepository
+
 
 class GardenLinuxRepo(APTRepository):
     """

src/gardenlinux/apt/package_repo_info.py

@@ -17,7 +17,6 @@
 from .cname import CName
 from .parser import Parser
 
-
 _ARGS_TYPE_ALLOWED = [
     "cname",
     "cname_base",

src/gardenlinux/features/__main__.py

@@ -4,11 +4,10 @@
 Canonical name (cname)
 """
 
-from typing import Optional
 import re
+from typing import Optional
 
 from ..constants import ARCHS
-
 from .parser import Parser
 
 

src/gardenlinux/features/cname.py

@@ -5,21 +5,20 @@
 gl-cname main entrypoint
 """
 
-from functools import reduce
-from os.path import basename, dirname
 import argparse
 import logging
 import re
-
-from .cname import CName
-from .parser import Parser
+from functools import reduce
+from os.path import basename, dirname
 
 from .__main__ import (
     get_cname_base,
     get_minimal_feature_set,
     get_version_and_commit_id_from_files,
     sort_subset,
 )
+from .cname import CName
+from .parser import Parser
 
 
 def main():

src/gardenlinux/features/cname_main.py

@@ -4,21 +4,21 @@
 Features parser based on networkx.Digraph
 """
 
-from glob import glob
-from typing import Callable, Optional
 import logging
-import networkx
 import os
 import re
 import subprocess
+from glob import glob
+from typing import Callable, Optional
+
+import networkx
 import yaml
 
 from ..constants import (
     ARCHS,
     BARE_FLAVOR_FEATURE_CONTENT,
     BARE_FLAVOR_LIBC_FEATURE_CONTENT,
 )
-
 from ..logger import LoggerSetup
 
 

src/gardenlinux/features/parser.py

@@ -5,16 +5,16 @@
 gl-flavors-parse main entrypoint
 """
 
-from argparse import ArgumentParser
-from pathlib import Path
-from tempfile import TemporaryDirectory
 import json
 import os
 import sys
+from argparse import ArgumentParser
+from pathlib import Path
+from tempfile import TemporaryDirectory
 
-from .parser import Parser
 from ..constants import GL_REPOSITORY_URL
 from ..git import Repository
+from .parser import Parser
 
 
 def _get_flavors_file_data(flavors_file):