rpms/modulemd-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Generate profiles section and modulemd-defaults file

Browse Source 
Resolves: rhbz#2215797
This commit is contained in:
Jakub Kadlcik 2023-07-21 17:31:46 +02:00
parent 1886a05e06
commit bac8cd6071
2 changed files with 205 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
0001-dir2module-generate-also-profiles-and-modulemd-defau.patch Normal file
View File

@ -0,0 +1,193 @@
From 908b48d28cf68946dfe2f309d73f3f2a12efe021 Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Thu, 19 Aug 2021 00:33:59 +0200
Subject: [PATCH] dir2module: generate also profiles and modulemd-defaults file
---
dir2module/dir2module/dir2module.py | 102 ++++++++++++++++++++++++----
dir2module/tests/conftest.py | 2 +-
2 files changed, 90 insertions(+), 14 deletions(-)
diff --git a/dir2module/dir2module/dir2module.py b/dir2module/dir2module/dir2module.py
index 9902aec..6643a83 100755
--- a/dir2module/dir2module/dir2module.py
+++ b/dir2module/dir2module/dir2module.py
@@ -20,13 +20,13 @@ gi.require_version("Modulemd", "2.0")
from gi.repository import Modulemd # noqa: E402
-class Module(object):
+class ModuleBase:
"""
- Provide a high-level interface for representing modules and yaml generation
- based on their values.
+ Base class for modulemd things
"""
+
def __init__(self, name, stream, version, context, arch, summary,
- description, module_license, licenses, package_nevras, requires):
+ description, module_license, licenses, packages, requires):
self.name = name
self.stream = stream
self.version = version
@@ -36,18 +36,69 @@ class Module(object):
self.description = description
self.module_license = module_license
self.licenses = licenses
- self.package_nevras = package_nevras
+ self.packages = packages
self.requires = requires
+ @property
+ def filename_format(self):
+ """
+ String format for the modulemd filename. It can contain the following
+ variables:
+ {N} - Module name
+ {S} - Module stream name
+ {V} - Module version
+ {C} - Module context
+ {A} - Module architecture
+ """
+ raise NotImplementedError
+
+ def dumps(self):
+ """
+ Generate YAML based on input parameters and return it as a string
+ """
+ raise NotImplementedError
+
@property
def filename(self):
"""
Generate filename for a module yaml
"""
- return "{N}:{S}:{V}:{C}:{A}.modulemd.yaml".format(
+ return self.filename_format.format(
N=self.name, S=self.stream, V=self.version,
C=self.context, A=self.arch)
+ def dump(self):
+ """
+ Generate modulemd yaml based on input parameters write it into file
+ """
+ with open(self.filename, "w") as moduleyaml:
+ moduleyaml.write(self.dumps())
+
+ @property
+ def package_names(self):
+ """
+ Return the list of unique package names within this module
+ """
+ return {package.header.name for package in self.packages}
+
+ @property
+ def package_nevras(self):
+ """
+ Return the list of unique package NEVRAs within this module
+ """
+ return {package.nevra for package in self.packages}
+
+
+class Module(ModuleBase):
+ """
+ Provide a high-level interface for representing modules and yaml generation
+ based on their values.
+ """
+
+ @property
+ def filename_format(self):
+ return "{N}:{S}:{V}:{C}:{A}.modulemd.yaml"
+
def dumps(self):
"""
Generate modulemd yaml based on input parameters and return it as a string
@@ -70,16 +121,37 @@ class Module(object):
dependencies.add_runtime_stream(depname, depstream)
mod_stream.add_dependencies(dependencies)
+ profile = Modulemd.Profile.new("common")
+ for pkgname in self.package_names:
+ profile.add_rpm(pkgname)
+ mod_stream.add_profile(profile)
+
index = Modulemd.ModuleIndex.new()
index.add_module_stream(mod_stream)
return index.dump_to_string()
- def dump(self):
+
+class ModuleDefaults(ModuleBase):
+ """
+ Provide a high-level interface for representing modulemd defaults files
+ """
+
+ @property
+ def filename_format(self):
+ return "{N}:{S}:{V}:{C}:{A}.modulemd-defaults.yaml"
+
+ def dumps(self):
"""
- Generate modulemd yaml based on input parameters write it into file
+ Generate modulemd_defaults yaml based on input parameters and return it
+ as a string
"""
- with open(self.filename, "w") as moduleyaml:
- moduleyaml.write(self.dumps())
+ mod_defaults = Modulemd.DefaultsV1.new(self.name)
+ mod_defaults.set_default_stream(self.stream)
+ mod_defaults.add_default_profile_for_stream(self.stream, "common")
+
+ index = Modulemd.ModuleIndex.new()
+ index.add_defaults(mod_defaults)
+ return index.dump_to_string()
class Package(object):
@@ -220,7 +292,6 @@ def main():
packages = [Package(package) for package in packages]
licenses = {package.license for package in packages}
- nevras = {package.nevra for package in packages}
requires = parse_dependencies(args.requires)
description = args.description \
@@ -238,8 +309,10 @@ def main():
raise RuntimeError("All packages need to contain the `modularitylabel` header. "
"To suppress this constraint, use `--force` parameter")
- module = Module(name, stream, version, context, arch, args.summary,
- description, args.license, licenses, nevras, requires)
+ modargs = [name, stream, version, context, arch, args.summary, description,
+ args.license, licenses, packages, requires]
+ module = Module(*modargs)
+ module_defaults = ModuleDefaults(*modargs)
if args.stdout:
print(module.dumps())
@@ -247,6 +320,9 @@ def main():
module.dump()
print("Created {0}".format(module.filename))
+ module_defaults.dump()
+ print("Created {0}".format(module_defaults.filename))
+
if __name__ == "__main__":
try:
diff --git a/dir2module/tests/conftest.py b/dir2module/tests/conftest.py
index 9309b44..c6956cb 100644
--- a/dir2module/tests/conftest.py
+++ b/dir2module/tests/conftest.py
@@ -15,7 +15,7 @@ def dummy_module():
'description': 'One dummy module for your tests',
'module_license': 'No License',
'licenses': [],
- 'package_nevras': [],
+ 'packages': [],
'requires': {}
}
--
2.41.0

13
modulemd-tools.spec
View File

@ -1,6 +1,6 @@
Name: modulemd-tools
Version: 0.9
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Collection of tools for parsing and generating modulemd YAML files
License: MIT
BuildArch: noarch
@ -8,6 +8,10 @@ BuildArch: noarch
URL: https://github.com/rpm-software-management/modulemd-tools
Source0: https://github.com/rpm-software-management/modulemd-tools/archive/%{version}/%{name}-%{version}.tar.gz
# https://github.com/rpm-software-management/modulemd-tools/commit/195df77
Patch0: 0001-dir2module-generate-also-profiles-and-modulemd-defau.patch
BuildRequires: createrepo_c
BuildRequires: argparse-manpage
BuildRequires: python3-devel
@ -50,7 +54,7 @@ modulemd-generate-macros - Generate module-build-macros SRPM package, which is
%prep
%setup -q
%autosetup -p1
%build
@ -156,6 +160,11 @@ cd ..
%changelog
* Fri Jul 21 2023 Jakub Kadlcik <jkadlcik@redhat.com> - 0.9-4
- Generate profiles section and modulemd-defaults file
Related: rhbz#1801747
- Use autosetup to automatically apply patches
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.9-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688