- The version is bumped

- The changelog is updated
- The test `create_packages_json` is fixed

@BS-NOBUILD
@BS-TARGET-CL8

Change-Id: I173013da990eb296e58ca8f3555a05913ca1c852
This commit is contained in:
soksanichenko 2021-12-20 13:53:21 +02:00
parent f2ed64d952
commit 58a16e5688
3 changed files with 10 additions and 6 deletions

View File

@ -1,7 +1,7 @@
%{?python_enable_dependency_generator} %{?python_enable_dependency_generator}
Name: pungi Name: pungi
Version: 4.2.13 Version: 4.2.14
Release: 1%{?dist}.cloudlinux Release: 1%{?dist}.cloudlinux
Summary: Distribution compose tool Summary: Distribution compose tool
@ -160,6 +160,9 @@ python3 -m pytest
%changelog %changelog
* Mon Dec 20 2021 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.14-1
- ALBS-66: The generator of packages JSON can process the same packages with different versions
* Fri Jun 18 2021 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.13-1 * Fri Jun 18 2021 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.13-1
- LNX-326: Add the ability to include any package by mask in packages.json to the generator - LNX-326: Add the ability to include any package by mask in packages.json to the generator
- LNX-318: Modify build scripts for building CloudLinux OS 8.4 - LNX-318: Modify build scripts for building CloudLinux OS 8.4

View File

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

View File

@ -75,18 +75,19 @@ class TestPackagesJson(TestCase):
) )
) )
) )
test_packages['TestRepo']['x86_64']['zziplib'] = \
[
'zziplib.x86_64',
]
test_packages['TestRepo2']['x86_64']['zziplib'] = \ test_packages['TestRepo2']['x86_64']['zziplib'] = \
[ [
'zziplib.i686', 'zziplib.i686',
'zziplib.x86_64',
] ]
test_packages['TestRepo2']['x86_64']['389-ds-base-new'] = \ test_packages['TestRepo2']['x86_64']['389-ds-base-new'] = \
[ [
'389-ds-base-new.x86_64', '389-ds-base-new.x86_64',
] ]
test_packages['TestRepo']['x86_64']['zziplib'] = \
[
'zziplib.x86_64',
]
result = pg.generate_packages_json() result = pg.generate_packages_json()
self.assertEqual( self.assertEqual(
test_packages, test_packages,