- The version is bumped

- The changelog is updated

pungi.spec

@@ -1,7 +1,7 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.2.15
+Version:        4.2.17
 Release:        1%{?dist}.cloudlinux
 Summary:        Distribution compose tool
 
@@ -39,7 +39,6 @@ BuildRequires:  python3-createrepo_c
 BuildRequires:  python3-dogpile-cache
 BuildRequires:  python3-parameterized
 BuildRequires:  python3-gobject-base
-BuildRequires:  python3-dataclasses
 
 #deps for doc building
 BuildRequires:  python3-sphinx
@@ -48,7 +47,6 @@ Requires:       python3-kobo-rpmlib >= 0.18.0
 Requires:       python3-productmd >= 1.33
 Requires:       python3-kickstart
 Requires:       python3-requests
-Requires:       python3-dataclasses
 Requires:       createrepo_c
 Requires:       koji >= 1.10.1-13
 Requires:       python3-koji-cli-plugins
@@ -160,6 +158,11 @@ python3 -m pytest
 
 
 %changelog
+* Tue Mar 22 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.17-1
+- ALBS-226: Patch pungi/lorax for building AL9
+
+* Thu Feb 25 2022 stepan_oksanichenio <soksanichenko@cloudlinux.com> - 4.2.16-1
+- ALBS-186: Move pungi to our gitea and build it for AL9
 
 * Thu Dec 30 2021 stepan_oksanichenio <soksanichenko@cloudlinux.com> - 4.2.15-1
 - ALBS-97: The scripts `gather_modules` and `generate_packages_json` support LZMA compression

pungi/scripts/gather_modules.py

@@ -12,6 +12,9 @@ import createrepo_c as cr
 from typing.io import BinaryIO
 
 
+EMPTY_FILE = '.empty'
+
+
 def _is_compressed_file(first_two_bytes: bytes, initial_bytes: bytes):
     return binascii.hexlify(first_two_bytes) == initial_bytes
 
@@ -65,6 +68,9 @@ def collect_modules(modules_paths: List[BinaryIO], target_dir: str):
     module_defaults_path = os.path.join(target_dir, 'module_defaults')
     os.makedirs(modules_path, exist_ok=True)
     os.makedirs(module_defaults_path, exist_ok=True)
+    # Defaults modules can be empty, but pungi detects
+    # empty folder while copying and raises the exception in this case
+    Path(os.path.join(module_defaults_path, EMPTY_FILE)).touch()
 
     for module_file in modules_paths:
         data = module_file.read()

setup.py

@@ -25,7 +25,7 @@ packages = sorted(packages)
 
 setup(
     name="pungi",
-    version="4.2.15",
+    version="4.2.17",
     description="Distribution compose tool",
     url="https://pagure.io/pungi",
     author="Dennis Gilmore",

tests/test_gather_modules.py

@@ -3,7 +3,7 @@ import gzip
 import os
 from io import StringIO
 import yaml
-from pungi.scripts.gather_modules import collect_modules
+from pungi.scripts.gather_modules import collect_modules, EMPTY_FILE
 import unittest
 from pyfakefs.fake_filesystem_unittest import TestCase
 
@@ -106,7 +106,7 @@ class TestModulesYamlParser(TestCase):
         self.assertEqual(['mariadb-devel-10.3_1-8010020200108182321.cdc1202b',
                           'javapackages-tools-201801-8000020190628172923.b07bea58'],
                          os.listdir(os.path.join(PATH_TO_KOJI, 'modules/x86_64')))
-        self.assertEqual(['ant.yaml'],
+        self.assertEqual([EMPTY_FILE, 'ant.yaml'],
                          os.listdir(os.path.join(PATH_TO_KOJI, 'module_defaults')))
 
         # check that modules were exported