Compare commits

...

9 Commits

Author SHA1 Message Date
5ac2e3de19 fix: handle permissionerror during walking over tree
Previously it tried to look into 700 directories (e.g. .gnupg) which
breaks running as non-ahriman user
2026-02-02 22:16:15 +02:00
799dc73d8a feat: update package status to success in case if package is up-to-date 2026-01-26 01:56:30 +02:00
4e79cbf71a fix: fallback to package name for missing bases in archive
package zoom is being generated without base, leading to None there

Closes #155
2026-01-22 16:34:19 +02:00
4fa5d55317 type: replace generator return type with iterator 2026-01-15 15:22:03 +02:00
a7fa3b90e4 type: fix typing in some modules 2026-01-14 14:28:31 +02:00
ce07cda8ab fix: pass underlying exception on extensionerror 2026-01-14 14:06:34 +02:00
00c4f32294 fix: correct exception type on repository id comparison 2026-01-14 13:59:07 +02:00
49cf91ea52 chore: copyright update 2026-01-08 02:50:37 +02:00
4a8430dc67 build: allow to rebuild images manually 2026-01-08 02:45:31 +02:00
349 changed files with 532 additions and 465 deletions

View File

@@ -7,6 +7,7 @@ on:
tags: tags:
- '*' - '*'
- '!*rc*' - '!*rc*'
workflow_dispatch:
permissions: permissions:
contents: read contents: read

View File

@@ -215,6 +215,7 @@ Again, the most checks can be performed by `tox` command, though some additional
* It is allowed to change web API to add new fields or remove optional ones. However, in case of model changes, new API version must be introduced. * It is allowed to change web API to add new fields or remove optional ones. However, in case of model changes, new API version must be introduced.
* On the other hand, it is allowed to change method signatures, however, it is recommended to add new parameters as optional if possible. Deprecated API can be dropped during major release. * On the other hand, it is allowed to change method signatures, however, it is recommended to add new parameters as optional if possible. Deprecated API can be dropped during major release.
* Enumerations (`Enum` classes) are allowed and recommended. However, it is recommended to use `StrEnum` class if there are from/to string conversions and `IntEnum` otherwise. * Enumerations (`Enum` classes) are allowed and recommended. However, it is recommended to use `StrEnum` class if there are from/to string conversions and `IntEnum` otherwise.
* `Generator` return type is not allowed. Generator functions must return generic `Iterator` object. Documentation should be described as `Yields`, however, because of pylint checks. Unfortunately, `Iterable` return type is not available for generators also, because of specific `contextlib.contextmanager` case.
### Other checks ### Other checks

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,7 @@ import argparse
import re import re
import sys import sys
from collections.abc import Generator from collections.abc import Iterator
from importlib import metadata from importlib import metadata
from typing import ClassVar from typing import ClassVar
@@ -77,7 +77,7 @@ class Versions(Handler):
return parser return parser
@staticmethod @staticmethod
def package_dependencies(root: str) -> Generator[tuple[str, str], None, None]: def package_dependencies(root: str) -> Iterator[tuple[str, str]]:
""" """
extract list of ahriman package dependencies installed into system with their versions extract list of ahriman package dependencies installed into system with their versions
@@ -87,7 +87,7 @@ class Versions(Handler):
Yields: Yields:
tuple[str, str]: map of installed dependency to its version tuple[str, str]: map of installed dependency to its version
""" """
def dependencies_by_key(key: str) -> Generator[str, None, None]: def dependencies_by_key(key: str) -> Iterator[str]:
# in importlib it returns requires in the following format # in importlib it returns requires in the following format
# ["pytest (>=3.0.0) ; extra == 'test'", "pytest-cov ; extra == 'test'"] # ["pytest (>=3.0.0) ; extra == 'test'", "pytest-cov ; extra == 'test'"]
try: try:

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -19,7 +19,7 @@
# #
import argparse import argparse
from collections.abc import Generator from collections.abc import Iterator
from pathlib import Path from pathlib import Path
from ahriman.application.handlers.handler import Handler, SubParserAction from ahriman.application.handlers.handler import Handler, SubParserAction
@@ -86,7 +86,7 @@ class Web(Handler):
return parser return parser
@staticmethod @staticmethod
def extract_arguments(args: argparse.Namespace, configuration: Configuration) -> Generator[str, None, None]: def extract_arguments(args: argparse.Namespace, configuration: Configuration) -> Iterator[str]:
""" """
extract list of arguments used for current command, except for command specific ones extract list of arguments used for current command, except for command specific ones

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -158,7 +158,7 @@ class Lock(LazyLogging):
""" """
check if current user is actually owner of ahriman root check if current user is actually owner of ahriman root
""" """
check_user(self.paths, unsafe=self.unsafe) check_user(self.paths.root, unsafe=self.unsafe)
self.paths.tree_create() self.paths.tree_create()
def check_version(self) -> None: def check_version(self) -> None:

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,7 @@ import itertools
import shutil import shutil
import tarfile import tarfile
from collections.abc import Generator, Iterable from collections.abc import Iterable, Iterator
from functools import cached_property from functools import cached_property
from pathlib import Path from pathlib import Path
from pyalpm import DB, Handle, Package, SIG_DATABASE_OPTIONAL, SIG_PACKAGE_OPTIONAL # type: ignore[import-not-found] from pyalpm import DB, Handle, Package, SIG_DATABASE_OPTIONAL, SIG_PACKAGE_OPTIONAL # type: ignore[import-not-found]
@@ -188,7 +188,7 @@ class Pacman(LazyLogging):
Returns: Returns:
dict[str, set[str]]: map of package name to its list of files dict[str, set[str]]: map of package name to its list of files
""" """
def extract(tar: tarfile.TarFile, versions: dict[str, str]) -> Generator[tuple[str, set[str]], None, None]: def extract(tar: tarfile.TarFile, versions: dict[str, str]) -> Iterator[tuple[str, set[str]]]:
for package_name, version in versions.items(): for package_name, version in versions.items():
path = Path(f"{package_name}-{version}") / "files" path = Path(f"{package_name}-{version}") / "files"
try: try:
@@ -223,7 +223,7 @@ class Pacman(LazyLogging):
return result return result
def package(self, package_name: str) -> Generator[Package, None, None]: def package(self, package_name: str) -> Iterator[Package]:
""" """
retrieve list of the packages from the repository by name retrieve list of the packages from the repository by name
@@ -256,7 +256,7 @@ class Pacman(LazyLogging):
return result return result
def provided_by(self, package_name: str) -> Generator[Package, None, None]: def provided_by(self, package_name: str) -> Iterator[Package]:
""" """
search through databases and emit packages which provides the ``package_name`` search through databases and emit packages which provides the ``package_name``

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,7 @@ import itertools
import re import re
import shlex import shlex
from collections.abc import Generator from collections.abc import Iterator
from enum import StrEnum from enum import StrEnum
from typing import IO from typing import IO
@@ -209,7 +209,7 @@ class PkgbuildParser(shlex.shlex):
Raises: Raises:
PkgbuildParserError: if array is not closed PkgbuildParserError: if array is not closed
""" """
def extract() -> Generator[str, None, None]: def extract() -> Iterator[str]:
while token := self.get_token(): while token := self.get_token():
match token: match token:
case _ if self._is_escaped(): case _ if self._is_escaped():
@@ -276,7 +276,7 @@ class PkgbuildParser(shlex.shlex):
return content return content
def _parse_token(self, token: str) -> Generator[PkgbuildPatch, None, None]: def _parse_token(self, token: str) -> Iterator[PkgbuildPatch]:
""" """
parse single token to the PKGBUILD field parse single token to the PKGBUILD field
@@ -360,7 +360,7 @@ class PkgbuildParser(shlex.shlex):
raise PkgbuildParserError("reached starting position, no valid symbols found") raise PkgbuildParserError("reached starting position, no valid symbols found")
def parse(self) -> Generator[PkgbuildPatch, None, None]: def parse(self) -> Iterator[PkgbuildPatch]:
""" """
parse source stream and yield parsed entries parse source stream and yield parsed entries

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -44,7 +44,7 @@ class AUR(Remote):
""" """
generate remote git url from the package base generate remote git url from the package base
Args Args:
package_base(str): package base package_base(str): package base
repository(str): repository name repository(str): repository name
@@ -58,7 +58,7 @@ class AUR(Remote):
""" """
generate remote web url from the package base generate remote web url from the package base
Args Args:
package_base(str): package base package_base(str): package base
Returns: Returns:

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -46,7 +46,7 @@ class Official(Remote):
""" """
generate remote git url from the package base generate remote git url from the package base
Args Args:
package_base(str): package base package_base(str): package base
repository(str): repository name repository(str): repository name
@@ -60,7 +60,7 @@ class Official(Remote):
""" """
generate remote web url from the package base generate remote web url from the package base
Args Args:
package_base(str): package base package_base(str): package base
Returns: Returns:

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -110,7 +110,7 @@ class Remote(SyncHttpClient):
""" """
generate remote git url from the package base generate remote git url from the package base
Args Args:
package_base(str): package base package_base(str): package base
repository(str): repository name repository(str): repository name
@@ -127,7 +127,7 @@ class Remote(SyncHttpClient):
""" """
generate remote web url from the package base generate remote web url from the package base
Args Args:
package_base(str): package base package_base(str): package base
Returns: Returns:

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -19,7 +19,7 @@
# #
import shutil import shutil
from collections.abc import Generator from collections.abc import Iterator
from pathlib import Path from pathlib import Path
from typing import ClassVar from typing import ClassVar
@@ -347,7 +347,7 @@ class Sources(LazyLogging):
""" """
gitconfig = gitconfig or {} gitconfig = gitconfig or {}
def configuration_flags() -> Generator[str, None, None]: def configuration_flags() -> Iterator[str]:
for option, value in (self.GITCONFIG | gitconfig).items(): for option, value in (self.GITCONFIG | gitconfig).items():
yield "-c" yield "-c"
yield f"{option}=\"{value}\"" yield f"{option}=\"{value}\""

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
from collections.abc import Generator from collections.abc import Iterator
from pathlib import Path from pathlib import Path
from ahriman.core.build_tools.sources import Sources from ahriman.core.build_tools.sources import Sources
@@ -77,7 +77,7 @@ class Task(LazyLogging):
Returns: Returns:
list[Path]: list of file paths which looks like freshly generated archives list[Path]: list of file paths which looks like freshly generated archives
""" """
def files() -> Generator[Path, None, None]: def files() -> Iterator[Path]:
for filepath in sources_dir.iterdir(): for filepath in sources_dir.iterdir():
if filepath in source_files: if filepath in source_files:
continue # skip files which were already there continue # skip files which were already there

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,7 @@ import configparser
import os import os
import sys import sys
from collections.abc import Generator, Mapping, MutableMapping from collections.abc import Iterator, Mapping, MutableMapping
from string import Template from string import Template
from typing import Any, ClassVar from typing import Any, ClassVar
@@ -37,7 +37,7 @@ class ShellInterpolator(configparser.Interpolation):
@staticmethod @staticmethod
def _extract_variables(parser: MutableMapping[str, Mapping[str, str]], value: str, def _extract_variables(parser: MutableMapping[str, Mapping[str, str]], value: str,
defaults: Mapping[str, str]) -> Generator[tuple[str, str], None, None]: defaults: Mapping[str, str]) -> Iterator[tuple[str, str]]:
""" """
extract keys and values (if available) from the configuration. In case if a key is not available, it will be extract keys and values (if available) from the configuration. In case if a key is not available, it will be
silently skipped from the result silently skipped from the result
@@ -50,7 +50,7 @@ class ShellInterpolator(configparser.Interpolation):
Yields: Yields:
tuple[str, str]: variable name used for substitution and its value tuple[str, str]: variable name used for substitution and its value
""" """
def identifiers() -> Generator[tuple[str | None, str], None, None]: def identifiers() -> Iterator[tuple[str | None, str]]:
# extract all found identifiers and parse them # extract all found identifiers and parse them
for identifier in ShellTemplate(value).get_identifiers(): for identifier in ShellTemplate(value).get_identifiers():
match identifier.rsplit(":", maxsplit=1): match identifier.rsplit(":", maxsplit=1):

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -20,7 +20,7 @@
import fnmatch import fnmatch
import re import re
from collections.abc import Generator, Mapping from collections.abc import Iterator, Mapping
from string import Template from string import Template
@@ -132,7 +132,7 @@ class ShellTemplate(Template):
(self._REPLACE, self._replace, "/"), (self._REPLACE, self._replace, "/"),
) )
def generator(variables: dict[str, str]) -> Generator[tuple[str, str], None, None]: def generator(variables: dict[str, str]) -> Iterator[tuple[str, str]]:
for identifier in self.get_identifiers(): for identifier in self.get_identifiers():
for regex, function, greediness in substitutions: for regex, function, greediness in substitutions:
if m := regex.match(identifier): if m := regex.match(identifier):

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).
@@ -109,7 +109,7 @@ class Validator(RootValidator):
Args: Args:
constraint(list[str]): optional list of allowed special words (e.g. ``localhost``) constraint(list[str]): optional list of allowed special words (e.g. ``localhost``)
field(str): field name to be checked field(str): field name to be checked
value(Path): value to be checked value(str): value to be checked
Examples: Examples:
The rule's arguments are validated against this schema: The rule's arguments are validated against this schema:

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

View File

@@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2025 ahriman team. # Copyright (c) 2021-2026 ahriman team.
# #
# This file is part of ahriman # This file is part of ahriman
# (see https://github.com/arcan1s/ahriman). # (see https://github.com/arcan1s/ahriman).

Some files were not shown because too many files have changed in this diff Show More