- Mock of Koji is moved to the separate modules, classes

- Unittests for mock of Koji are moved to the separate
- AL9 version
- Use builtin mock instead python library

pungi.spec

@@ -1,7 +1,7 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.2.17
+Version:        4.2.19
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -9,9 +9,7 @@ License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        %{name}-%{version}.tar.bz2
 
-BuildRequires:  python3-nose
 BuildRequires:  python3-pytest
-BuildRequires:  python3-mock
 BuildRequires:  python3-pyfakefs
 BuildRequires:  python3-ddt
 BuildRequires:  python3-devel
@@ -39,7 +37,6 @@ BuildRequires:  python3-createrepo_c >= 0.20.1
 BuildRequires:  python3-dogpile-cache
 BuildRequires:  python3-parameterized
 BuildRequires:  python3-gobject-base
-BuildRequires:  python3-dataclasses
 
 #deps for doc building
 BuildRequires:  python3-sphinx
@@ -48,7 +45,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 >= 0.20.1
 Requires:       koji >= 1.10.1-13
 Requires:       python3-koji-cli-plugins
@@ -160,14 +156,19 @@ python3 -m pytest
 
 
 %changelog
-
+* Wed Oct 19 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.19-1
-* Wed Oct 19 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.17-1
 - Replace list of cr.packages by cr.PackageIterator in package JSON generator
 - Do not lose a module from koji if we have more than one arch (e.g. x86_64 + i686)
 
-* Wed May 4 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.16-1
+* Wed May 4 2022 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.18-1
 - ALBS-334: Make the ability of Pungi to give module_defaults from remote sources
 
+* 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
 - ALBS-97: The script `generate_packages_json` can use repos with different architectures

setup.py

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

tests/test_arch.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import unittest
 
 from pungi.arch import (

tests/test_arguments.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_checks.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_compose.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_config.py

@@ -7,7 +7,7 @@ except ImportError:
     import unittest
 
 import six
-import mock
+from unittest import mock
 
 from pungi import checks
 from tests.helpers import load_config, PKGSET_REPOS

tests/test_config_validate_script.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import os
 import six
 

tests/test_createiso_phase.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import six
 
 import os

tests/test_createiso_script.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 from six.moves import StringIO

tests/test_createrepophase.py

@@ -5,7 +5,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import glob
 import os

tests/test_extra_files_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from productmd.extra_files import ExtraFiles

tests/test_gather_method_deps.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 from pungi.phases.gather.methods import method_deps as deps
 from tests import helpers

tests/test_gather_method_hybrid.py

@@ -2,7 +2,7 @@
 
 from collections import namedtuple
 import copy
-import mock
+from unittest import mock
 import os
 
 import six

tests/test_gather_method_nodeps.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import six

tests/test_gather_phase.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import copy
-import mock
+from unittest import mock
 import os
 
 try:

tests/test_gather_source_module.py

@@ -5,7 +5,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 from pungi.phases.gather.sources.source_module import GatherSourceModule

tests/test_imagebuildphase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import six
 

tests/test_imagechecksumphase.py

@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import os
 import tempfile

tests/test_initphase.py

@@ -5,7 +5,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import six
 

tests/test_iso_wrapper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import itertools
-import mock
+from unittest import mock
 import os
 import six
 

tests/test_koji_wrapper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_linker.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import errno
 import os
 import stat

tests/test_liveimagesphase.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 
 import six
 

tests/test_livemediaphase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 

tests/test_media_split.py

@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 from pungi import media_split
 

tests/test_metadata.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import os
 
 import six

tests/test_notifier.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_orchestrator.py

@@ -9,7 +9,7 @@ import shutil
 import subprocess
 from textwrap import dedent
 
-import mock
+from unittest import mock
 import six
 from six.moves import configparser
 

tests/test_osbs_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import json
 
 import copy

tests/test_osbuild_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 

tests/test_ostree_installer_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 

tests/test_ostree_phase.py

@@ -2,7 +2,7 @@
 
 
 import json
-import mock
+from unittest import mock
 
 import os
 

tests/test_ostree_script.py

@@ -4,7 +4,7 @@
 import json
 import os
 
-import mock
+from unittest import mock
 import six
 import yaml
 

tests/test_ostree_utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 

tests/test_patch_iso.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 try:

tests/test_phase_base.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_pkgset_common.py

@@ -2,7 +2,7 @@
 
 import os
 
-import mock
+from unittest import mock
 import six
 
 from pungi.module_util import Modulemd

tests/test_pkgset_pkgsets.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import ddt as ddt
-import mock
+from unittest import mock
 import os
 import six
 

tests/test_repoclosure_phase.py

@@ -6,7 +6,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 import pungi.phases.repoclosure as repoclosure_phase

tests/test_runroot.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from pungi.runroot import Runroot

tests/test_scm.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest

tests/test_test_phase.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import pungi.phases.test as test_phase

tests/test_unified_isos.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 import shutil
 import six

tests/test_util.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-import mock
+from unittest import mock
 import os
 
 try: