arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-06-28 06:41:43 +00:00
Code Issues Projects Releases Wiki Activity

feat: remove excess dependencies leaves (#128)

Browse Source 
This mr improves implicit dependencies processing by reducing tree leaves by using the following algorithm:

* remove paths which belong to any base package
* remove packages which are (opt)dependencies of one of the package which provides same path. It also tries to handle circular dependencies by excluding them from being "satisfied"
* remove packages which are already satisfied by any children path
This commit is contained in:
Evgenii Alekseev
2024-08-06 18:00:53 +03:00
parent a01b090c2b
commit 434057ec49
11 changed files with 425 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/ahriman/conftest.py
View File

@ -181,6 +181,7 @@ def aur_package_ahriman() -> AURPackage:
provides=[],
license=["GPL3"],
keywords=[],
groups=[],
)
@ -228,6 +229,7 @@ def aur_package_akonadi() -> AURPackage:
provides=[],
license=["LGPL"],
keywords=[],
groups=[],
)
@ -397,7 +399,8 @@ def package_description_ahriman() -> PackageDescription:
groups=[],
installed_size=4200000,
licenses=["GPL3"],
url="https://github.com/arcan1s/ahriman")
url="https://github.com/arcan1s/ahriman",
)
@pytest.fixture
@ -418,7 +421,8 @@ def package_description_python_schedule() -> PackageDescription:
groups=[],
installed_size=4200001,
licenses=["MIT"],
url="https://github.com/dbader/schedule")
url="https://github.com/dbader/schedule",
)
@pytest.fixture
@ -439,7 +443,8 @@ def package_description_python2_schedule() -> PackageDescription:
groups=[],
installed_size=4200002,
licenses=["MIT"],
url="https://github.com/dbader/schedule")
url="https://github.com/dbader/schedule",
)
@pytest.fixture

2
tests/ahriman/core/log/test_lazy_logging.py
View File

@ -30,7 +30,7 @@ def test_package_logger_set_reset(database: SQLite) -> None:
database._package_logger_reset()
record = logging.makeLogRecord({})
with pytest.raises(AttributeError):
record.package_id
assert record.package_id
def test_in_package_context(database: SQLite, package_ahriman: Package, mocker: MockerFixture) -> None:

19
tests/ahriman/models/conftest.py
View File

@ -6,10 +6,12 @@ from unittest.mock import MagicMock, PropertyMock
from pytest_mock import MockerFixture
from ahriman import __version__
from ahriman.core.alpm.pacman import Pacman
from ahriman.core.alpm.remote import AUR
from ahriman.models.aur_package import AURPackage
from ahriman.models.build_status import BuildStatus, BuildStatusEnum
from ahriman.models.counters import Counters
from ahriman.models.filesystem_package import FilesystemPackage
from ahriman.models.internal_status import InternalStatus
from ahriman.models.package import Package
from ahriman.models.package_archive import PackageArchive
@ -46,6 +48,17 @@ def counters() -> Counters:
success=0)
@pytest.fixture
def filesystem_package() -> FilesystemPackage:
"""
filesystem_package fixture
Returns:
FilesystemPackage: filesystem package test instance
"""
return FilesystemPackage(package_name="package", depends={"dependency"}, opt_depends={"optional"})
@pytest.fixture
def internal_status(counters: Counters) -> InternalStatus:
"""
@ -65,7 +78,7 @@ def internal_status(counters: Counters) -> InternalStatus:
@pytest.fixture
def package_archive_ahriman(package_ahriman: Package, repository_paths: RepositoryPaths,
def package_archive_ahriman(package_ahriman: Package, repository_paths: RepositoryPaths, pacman: Pacman,
passwd: Any, mocker: MockerFixture) -> PackageArchive:
"""
package archive fixture
@ -73,6 +86,7 @@ def package_archive_ahriman(package_ahriman: Package, repository_paths: Reposito
Args:
package_ahriman(Package): package test instance
repository_paths(RepositoryPaths): repository paths test instance
pacman(Pacman): pacman test instance
passwd(Any): passwd structure test instance
mocker(MockerFixture): mocker object
@ -80,7 +94,7 @@ def package_archive_ahriman(package_ahriman: Package, repository_paths: Reposito
PackageArchive: package archive test instance
"""
mocker.patch("ahriman.models.repository_paths.getpwuid", return_value=passwd)
return PackageArchive(repository_paths.build_directory, package_ahriman)
return PackageArchive(repository_paths.build_directory, package_ahriman, pacman)
@pytest.fixture
@ -150,6 +164,7 @@ def pyalpm_package_ahriman(aur_package_ahriman: AURPackage) -> MagicMock:
type(mock).provides = PropertyMock(return_value=aur_package_ahriman.provides)
type(mock).version = PropertyMock(return_value=aur_package_ahriman.version)
type(mock).url = PropertyMock(return_value=aur_package_ahriman.url)
type(mock).groups = PropertyMock(return_value=aur_package_ahriman.groups)
return mock

7
tests/ahriman/models/test_dependencies.py
View File

@ -1,6 +1,13 @@
from ahriman.models.dependencies import Dependencies
def test_post_init() -> None:
"""
must remove empty leaves
"""
assert Dependencies({"path": ["package"], "empty": []}) == Dependencies({"path": ["package"]})
def test_from_json_view() -> None:
"""
must construct and serialize dependencies to json

60
tests/ahriman/models/test_filesystem_package.py Normal file
View File

@ -0,0 +1,60 @@
from ahriman.models.filesystem_package import FilesystemPackage
def test_post_init() -> None:
"""
must trim versions and descriptions from dependencies list
"""
assert FilesystemPackage(package_name="p", depends={"a=1"}, opt_depends={"c: a description"}) == \
FilesystemPackage(package_name="p", depends={"a"}, opt_depends={"c"})
def test_depends_on(filesystem_package: FilesystemPackage) -> None:
"""
must correctly check package dependencies
"""
assert filesystem_package.depends_on("dependency", include_optional=False)
assert not filesystem_package.depends_on("random", include_optional=False)
def test_depends_on_optional(filesystem_package: FilesystemPackage) -> None:
"""
must correctly check optional dependencies
"""
assert filesystem_package.depends_on("optional", include_optional=True)
assert not filesystem_package.depends_on("optional", include_optional=False)
assert not filesystem_package.depends_on("random", include_optional=True)
def test_is_root_package() -> None:
"""
must correctly identify root packages
"""
package = FilesystemPackage(package_name="package", depends={"dependency"}, opt_depends={"optional"})
dependency = FilesystemPackage(package_name="dependency", depends=set(), opt_depends=set())
optional = FilesystemPackage(package_name="optional", depends=set(), opt_depends={"package"})
packages = [package, dependency, optional]
assert not package.is_root_package(packages, include_optional=True)
assert not package.is_root_package(packages, include_optional=False)
assert dependency.is_root_package(packages, include_optional=True)
assert dependency.is_root_package(packages, include_optional=False)
assert not optional.is_root_package(packages, include_optional=True)
assert optional.is_root_package(packages, include_optional=False)
def test_is_root_package_circular() -> None:
"""
must correctly identify root packages with circular dependencies
"""
package1 = FilesystemPackage(package_name="package1", depends={"package2"}, opt_depends=set())
package2 = FilesystemPackage(package_name="package2", depends={"package1"}, opt_depends=set())
assert package1.is_root_package([package1, package2], include_optional=False)
assert package2.is_root_package([package1, package2], include_optional=False)
package1 = FilesystemPackage(package_name="package1", depends=set(), opt_depends={"package2"})
package2 = FilesystemPackage(package_name="package2", depends=set(), opt_depends={"package1"})
assert not package1.is_root_package([package1, package2], include_optional=True)
assert package1.is_root_package([package1, package2], include_optional=False)

137
tests/ahriman/models/test_package_archive.py
View File

@ -1,7 +1,10 @@
from io import BytesIO
from pathlib import Path
from pytest_mock import MockerFixture
from unittest.mock import MagicMock, PropertyMock
from ahriman.core.exceptions import UnknownPackageError
from ahriman.models.filesystem_package import FilesystemPackage
from ahriman.models.package_archive import PackageArchive
@ -44,27 +47,135 @@ def test_is_elf() -> None:
assert PackageArchive.is_elf(BytesIO(b"\x7fELF\nrandom string"))
def test_depends_on(package_archive_ahriman: PackageArchive, mocker: MockerFixture) -> None:
def test_load_pacman_package(package_archive_ahriman: PackageArchive, mocker: MockerFixture) -> None:
"""
must extract packages and files which are dependencies for the package
must correctly load filesystem package from pacman
"""
mocker.patch("ahriman.models.package_archive.PackageArchive.installed_packages", return_value={
package_archive_ahriman.package.base: ([Path("usr") / "dir2"], [Path("file1")]),
"package1": (
[Path("package1") / "dir1", Path("usr") / "dir2"],
[Path("package1") / "file1", Path("package1") / "file2"],
directory = f"{package_archive_ahriman.package.base}-{package_archive_ahriman.package.version}"
path = Path("/") / "var" / "lib" / "pacman" / "local" / directory / "files"
package = MagicMock()
type(package).depends = PropertyMock(return_value=["depends"])
type(package).opt_depends = PropertyMock(return_value=["opt_depends"])
info_mock = mocker.patch("ahriman.core.alpm.remote.OfficialSyncdb.info", return_value=package)
assert package_archive_ahriman._load_pacman_package(path) == FilesystemPackage(
package_name=package_archive_ahriman.package.base,
depends={"depends"},
opt_depends={"opt_depends"},
)
info_mock.assert_called_once_with(package_archive_ahriman.package.base, pacman=package_archive_ahriman.pacman)
def test_load_pacman_package_exception(package_archive_ahriman: PackageArchive, mocker: MockerFixture) -> None:
"""
must return empty package if no package found
"""
directory = f"{package_archive_ahriman.package.base}-{package_archive_ahriman.package.version}"
path = Path("/") / "var" / "lib" / "pacman" / "local" / directory / "files"
mocker.patch("ahriman.core.alpm.remote.OfficialSyncdb.info",
side_effect=UnknownPackageError(package_archive_ahriman.package.base))
assert package_archive_ahriman._load_pacman_package(path) == FilesystemPackage(
package_name=package_archive_ahriman.package.base,
depends=set(),
opt_depends=set(),
)
def test_raw_dependencies_packages(package_archive_ahriman: PackageArchive, mocker: MockerFixture) -> None:
"""
must correctly extract raw dependencies list
"""
packages = {
package_archive_ahriman.package.base: FilesystemPackage(
package_name=package_archive_ahriman.package.base,
depends=set(),
opt_depends=set(),
directories=[Path("usr") / "dir2"],
files=[Path("file1")],
),
"package2": (
[Path("usr") / "dir2", Path("package2") / "dir3", Path("package2") / "dir4"],
[Path("package2") / "file4", Path("package2") / "file3"],
"package1": FilesystemPackage(
package_name="package1",
depends=set(),
opt_depends=set(),
directories=[Path("package1") / "dir1", Path("usr") / "dir2"],
files=[Path("package1") / "file1", Path("package1") / "file2"],
),
})
"package2": FilesystemPackage(
package_name="package2",
depends=set(),
opt_depends=set(),
directories=[Path("usr") / "dir2", Path("package2") / "dir3", Path("package2") / "dir4"],
files=[Path("package2") / "file4", Path("package2") / "file3"],
),
}
mocker.patch("ahriman.models.package_archive.PackageArchive.installed_packages", return_value=packages)
mocker.patch("ahriman.models.package_archive.PackageArchive.depends_on_paths", return_value=(
{"file1", "file3"},
{Path("usr") / "dir2", Path("dir3"), Path("package2") / "dir4"},
))
result = package_archive_ahriman._raw_dependencies_packages()
assert result == {
Path("package1") / "file1": [packages["package1"]],
Path("package2") / "file3": [packages["package2"]],
Path("package2") / "dir4": [packages["package2"]],
Path("usr") / "dir2": [packages["package1"], packages["package2"]],
}
def test_refine_dependencies(package_archive_ahriman: PackageArchive, mocker: MockerFixture) -> None:
"""
must correctly refine dependencies list
"""
base_package = MagicMock()
type(base_package).depends = PropertyMock(return_value=["base"])
info_mock = mocker.patch("ahriman.core.alpm.remote.OfficialSyncdb.info", return_value=base_package)
path1 = Path("usr") / "lib" / "python3.12"
path2 = path1 / "site-packages"
path3 = Path("etc")
path4 = Path("var") / "lib" / "whatever"
package1 = FilesystemPackage(package_name="package1", depends={"package5"}, opt_depends={"package2"})
package2 = FilesystemPackage(package_name="package2", depends={"package1"}, opt_depends=set())
package3 = FilesystemPackage(package_name="package3", depends=set(), opt_depends={"package1"})
package4 = FilesystemPackage(package_name="base", depends=set(), opt_depends=set())
package5 = FilesystemPackage(package_name="package5", depends={"package1"}, opt_depends=set())
package6 = FilesystemPackage(package_name="package6", depends=set(), opt_depends=set())
assert package_archive_ahriman._refine_dependencies({
path1: [package1, package2, package3, package5, package6],
path2: [package1, package2, package3, package5],
path3: [package1, package4],
path4: [package1],
}) == {
path1: [package6],
path2: [package1, package5],
path4: [package1],
}
info_mock.assert_called_once_with("base", pacman=package_archive_ahriman.pacman)
def test_depends_on(package_archive_ahriman: PackageArchive, mocker: MockerFixture) -> None:
"""
must extract packages and files which are dependencies for the package
"""
raw_mock = mocker.patch("ahriman.models.package_archive.PackageArchive._raw_dependencies_packages",
return_value="1")
refined_mock = mocker.patch("ahriman.models.package_archive.PackageArchive._refine_dependencies", return_value={
Path("package1") / "file1": [FilesystemPackage(package_name="package1", depends=set(), opt_depends=set())],
Path("package2") / "file3": [FilesystemPackage(package_name="package2", depends=set(), opt_depends=set())],
Path("package2") / "dir4": [FilesystemPackage(package_name="package2", depends=set(), opt_depends=set())],
Path("usr") / "dir2": [
FilesystemPackage(package_name="package1", depends=set(), opt_depends=set()),
FilesystemPackage(package_name="package2", depends=set(), opt_depends=set()),
],
})
result = package_archive_ahriman.depends_on()
raw_mock.assert_called_once_with()
refined_mock.assert_called_once_with("1")
assert result.paths == {
"package1/file1": ["package1"],
"package2/file3": ["package2"],
@ -106,7 +217,7 @@ def test_installed_packages(package_archive_ahriman: PackageArchive, mocker: Moc
result = package_archive_ahriman.installed_packages()
assert result
assert Path("usr") in result[package_archive_ahriman.package.base][0]
assert Path("usr/bin/ahriman") in result[package_archive_ahriman.package.base][1]
assert Path("usr") in result[package_archive_ahriman.package.base].directories
assert Path("usr/bin/ahriman") in result[package_archive_ahriman.package.base].files
walk_mock.assert_called_once_with(package_archive_ahriman.root / "var" / "lib" / "pacman" / "local")
read_mock.assert_called_once_with(encoding="utf8")