Skip to content

Controller: format agnostic package interface #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rezib wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Controller: format agnostic package interface #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df5facc
Controller: format agnostic package interface
rezib Jun 12, 2025
1bdddbf
package: fix typo in comment
rezib Jan 20, 2026
5a0c655
package: make base classes abstract with abc
rezib Jan 20, 2026
50cdcbc
package: set of supported package formats
rezib Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
388 changes: 113 additions & 275 deletions lib/rift/Controller.py
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions lib/rift/Repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class ProjectArchRepositories:
"""
Manipulate repositories defined in a project for a particular architecture.
"""
def __init__(self, config, arch, extra=None):
def __init__(self, config, arch):

self.working = None
self.arch = arch
Expand All @@ -276,8 +276,6 @@ def __init__(self, config, arch, extra=None):
)
self.working.create()
self.supplementaries = []
if extra:
self.supplementaries.append(extra)
repos = config.get('repos', arch=arch)
if repos:
for name, data in repos.items():
Expand Down
6 changes: 3 additions & 3 deletions lib/rift/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import logging
import re

from rift.Package import Package
from rift.package import ProjectPackages
from rift.RPM import Spec

BuildRequirement = namedtuple("BuildRequirement", ["package", "reasons"])
Expand All @@ -51,7 +51,7 @@ class PackageDependencyNode:
def __init__(self, package):
self.package = package
# parse spec file subpackages and build requires
spec = Spec(package.specfile)
spec = Spec(package.buildfile)
self.subpackages = spec.provides
# Parse buildrequires string in spec file to discard explicit versions
# enforcement.
Expand Down Expand Up @@ -401,5 +401,5 @@ def from_project(cls, config, staff, modules):
if list is not provided.
"""
graph = cls()
graph.build(Package.list(config, staff, modules))
graph.build(ProjectPackages.list(config, staff, modules))
return graph
35 changes: 35 additions & 0 deletions lib/rift/package/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# Copyright (C) 2014-2025 CEA
#
# This file is part of Rift project.
#
# This software is governed by the CeCILL license under French law and
# abiding by the rules of distribution of free software. You can use,
# modify and/ or redistribute the software under the terms of the CeCILL
# license as circulated by CEA, CNRS and INRIA at the following URL
# "http://www.cecill.info".
#
# As a counterpart to the access to the source code and rights to copy,
# modify and redistribute granted by the license, users are provided only
# with a limited warranty and the software's author, the holder of the
# economic rights, and the successive licensors have only limited
# liability.
#
# In this respect, the user's attention is drawn to the risks associated
# with loading, using, modifying and/or developing or reproducing the
# software by the user in light of its specific status of free software,
# that may mean that it is complicated to manipulate, and that also
# therefore means that it is reserved for developers and experienced
# professionals having in-depth computer knowledge. Users are therefore
# encouraged to load and test the software's suitability as regards their
# requirements in conditions enabling the security of their systems and/or
# data to be ensured and, more generally, to use and operate it in the
# same conditions as regards security.
#
# The fact that you are presently reading this means that you have had
# knowledge of the CeCILL license and that you accept its terms.
#

"""Module to handle packages in different formats."""
from rift.package._base import Package, Test
from rift.package._project import ProjectPackages
Loading