Format code

Code didn't get well formatted when jenkins unusable.

Signed-off-by: Haibo Lin <hlin@redhat.com>

pungi/checks.py

@@ -75,8 +75,7 @@ def is_isohybrid_needed(conf):
 
 
 def is_genisoimage_needed(conf):
-    """This is only needed locally for createiso without runroot.
+    """This is only needed locally for createiso without runroot."""
-    """
     runroot_tag = conf.get("runroot_tag", "")
     if runroot_tag or conf.get("createiso_use_xorrisofs"):
         return False

pungi/graph.py

@@ -54,8 +54,7 @@ class SimpleAcyclicOrientedGraph(object):
         return False if node in self._graph else True
 
     def remove_final_endpoint(self, node):
-        """
+        """"""
-        """
         remove_start_points = []
         for start, ends in self._graph.items():
             if node in ends:

pungi/phases/osbuild.py

@@ -96,7 +96,12 @@ class RunOSBuildThread(WorkerThread):
         self.can_fail = can_fail
         self.num = num
         with util.failable(
-            compose, can_fail, variant, "*", "osbuild", logger=self.pool._logger,
+            compose,
+            can_fail,
+            variant,
+            "*",
+            "osbuild",
+            logger=self.pool._logger,
         ):
             self.worker(
                 compose, variant, config, arches, version, release, target, repo

pungi/scripts/create_unified_isos.py

@@ -16,7 +16,10 @@ def parse_args():
     parser = argparse.ArgumentParser(add_help=True)
 
     parser.add_argument(
-        "compose", metavar="<compose-path>", nargs=1, help="path to compose",
+        "compose",
+        metavar="<compose-path>",
+        nargs=1,
+        help="path to compose",
     )
     parser.add_argument(
         "--arch",

pungi/scripts/pungi_gather.py

@@ -18,13 +18,18 @@ from pungi.util import temp_dir
 def get_parser():
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "--profiler", action="store_true",
+        "--profiler",
+        action="store_true",
     )
     parser.add_argument(
-        "--arch", required=True,
+        "--arch",
+        required=True,
     )
     parser.add_argument(
-        "--config", metavar="PATH", required=True, help="path to kickstart config file",
+        "--config",
+        metavar="PATH",
+        required=True,
+        help="path to kickstart config file",
     )
     parser.add_argument(
         "--download-to",
@@ -42,7 +47,9 @@ def get_parser():
 
     group = parser.add_argument_group("Gather options")
     group.add_argument(
-        "--nodeps", action="store_true", help="disable resolving dependencies",
+        "--nodeps",
+        action="store_true",
+        help="disable resolving dependencies",
     )
     group.add_argument(
         "--selfhosting",
@@ -61,7 +68,9 @@ def get_parser():
         choices=["none", "all", "build"],
     )
     group.add_argument(
-        "--multilib", metavar="[METHOD]", action="append",
+        "--multilib",
+        metavar="[METHOD]",
+        action="append",
     )
     group.add_argument(
         "--tempdir",

pungi/wrappers/comps.py

@@ -355,7 +355,10 @@ class CompsWrapper(object):
 
             if environment.option_ids:
                 append_grouplist(
-                    doc, env_node, set(environment.option_ids), "optionlist",
+                    doc,
+                    env_node,
+                    set(environment.option_ids),
+                    "optionlist",
                 )
 
         if self.comps.langpacks:

pungi/wrappers/fus.py

@@ -26,7 +26,12 @@ Pungi).
 
 
 def get_cmd(
-    conf_file, arch, repos, lookasides, platform=None, filter_packages=None,
+    conf_file,
+    arch,
+    repos,
+    lookasides,
+    platform=None,
+    filter_packages=None,
 ):
     cmd = ["fus", "--verbose", "--arch", arch]
 

pungi/wrappers/kojiwrapper.py

@@ -202,7 +202,14 @@ class KojiWrapper(object):
         return cmd
 
     def get_pungi_ostree_cmd(
-        self, target, arch, args, channel=None, packages=None, mounts=None, weight=None,
+        self,
+        target,
+        arch,
+        args,
+        channel=None,
+        packages=None,
+        mounts=None,
+        weight=None,
     ):
         cmd = self._get_cmd("pungi-ostree", "--nowait", "--task-id")
 
@@ -322,9 +329,11 @@ class KojiWrapper(object):
             "ksurl",
             "distro",
         )
-        assert set(min_options).issubset(set(config_options["image-build"].keys())), (
+        assert set(min_options).issubset(
-            "image-build requires at least %s got '%s'"
+            set(config_options["image-build"].keys())
-            % (", ".join(min_options), config_options)
+        ), "image-build requires at least %s got '%s'" % (
+            ", ".join(min_options),
+            config_options,
         )
         cfg_parser = configparser.ConfigParser()
         for section, opts in config_options.items():

pungi_utils/orchestrator.py

@@ -302,8 +302,7 @@ def block_on(parts, name):
 
 
 def check_finished_processes(processes):
-    """Walk through all active processes and check if something finished.
+    """Walk through all active processes and check if something finished."""
-    """
     for proc in processes.keys():
         proc.poll()
         if proc.returncode is not None:

tests/helpers.py

@@ -215,7 +215,10 @@ class DummyCompose(object):
         self.log_warning = mock.Mock()
         self.get_image_name = mock.Mock(return_value="image-name")
         self.image = mock.Mock(
-            path="Client/i386/iso/image.iso", can_fail=False, size=123, _max_size=None,
+            path="Client/i386/iso/image.iso",
+            can_fail=False,
+            size=123,
+            _max_size=None,
         )
         self.im = mock.Mock(images={"Client": {"amd64": [self.image]}})
         self.old_composes = []
@@ -302,7 +305,10 @@ def mk_boom(cls=Exception, msg="BOOM"):
     return b
 
 
-PKGSET_REPOS = dict(pkgset_source="repos", pkgset_repos={},)
+PKGSET_REPOS = dict(
+    pkgset_source="repos",
+    pkgset_repos={},
+)
 
 BASE_CONFIG = dict(
     release_short="test",

tests/test_buildinstall.py

@@ -1920,7 +1920,8 @@ class BuildinstallThreadTestCase(PungiTestCase):
         "pungi.phases.buildinstall.BuildinstallThread._load_old_buildinstall_metadata"
     )
     def test_reuse_old_buildinstall_result_no_old_compose(
-        self, load_old_buildinstall_metadata,
+        self,
+        load_old_buildinstall_metadata,
     ):
         compose, pkgset_phase, cmd = self._prepare_buildinstall_reuse_test()
         load_old_buildinstall_metadata.return_value = None
@@ -1935,7 +1936,8 @@ class BuildinstallThreadTestCase(PungiTestCase):
         "pungi.phases.buildinstall.BuildinstallThread._load_old_buildinstall_metadata"
     )
     def test_reuse_old_buildinstall_result_different_cmd(
-        self, load_old_buildinstall_metadata,
+        self,
+        load_old_buildinstall_metadata,
     ):
         compose, pkgset_phase, cmd = self._prepare_buildinstall_reuse_test()
 
@@ -1958,7 +1960,8 @@ class BuildinstallThreadTestCase(PungiTestCase):
         "pungi.phases.buildinstall.BuildinstallThread._load_old_buildinstall_metadata"
     )
     def test_reuse_old_buildinstall_result_different_installed_pkgs(
-        self, load_old_buildinstall_metadata,
+        self,
+        load_old_buildinstall_metadata,
     ):
         compose, pkgset_phase, cmd = self._prepare_buildinstall_reuse_test()
         load_old_buildinstall_metadata.return_value = {
@@ -1978,7 +1981,9 @@ class BuildinstallThreadTestCase(PungiTestCase):
     )
     @mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
     def test_reuse_old_buildinstall_result_different_buildroot_rpms(
-        self, KojiWrapperMock, load_old_buildinstall_metadata,
+        self,
+        KojiWrapperMock,
+        load_old_buildinstall_metadata,
     ):
         compose, pkgset_phase, cmd = self._prepare_buildinstall_reuse_test()
         load_old_buildinstall_metadata.return_value = {

tests/test_config.py

@@ -22,7 +22,9 @@ class ConfigTestCase(unittest.TestCase):
 
 class PkgsetConfigTestCase(ConfigTestCase):
     def test_validate_minimal_pkgset_koji(self):
-        cfg = load_config(pkgset_source="koji",)
+        cfg = load_config(
+            pkgset_source="koji",
+        )
 
         self.assertValidation(cfg)
 
@@ -36,7 +38,9 @@ class PkgsetConfigTestCase(ConfigTestCase):
 
     def test_pkgset_mismatch_repos(self):
         cfg = load_config(
-            pkgset_source="repos", pkgset_koji_tag="f25", pkgset_koji_inherit=False,
+            pkgset_source="repos",
+            pkgset_koji_tag="f25",
+            pkgset_koji_inherit=False,
         )
 
         self.assertValidation(
@@ -51,7 +55,10 @@ class PkgsetConfigTestCase(ConfigTestCase):
         )
 
     def test_pkgset_mismatch_koji(self):
-        cfg = load_config(pkgset_source="koji", pkgset_repos={"whatever": "/foo"},)
+        cfg = load_config(
+            pkgset_source="koji",
+            pkgset_repos={"whatever": "/foo"},
+        )
 
         self.assertValidation(
             cfg, [checks.CONFLICTS.format("pkgset_source", "koji", "pkgset_repos")]
@@ -78,7 +85,10 @@ class ReleaseConfigTestCase(ConfigTestCase):
         )
 
     def test_only_config_base_product_name(self):
-        cfg = load_config(PKGSET_REPOS, base_product_name="Prod",)
+        cfg = load_config(
+            PKGSET_REPOS,
+            base_product_name="Prod",
+        )
 
         self.assertValidation(
             cfg,
@@ -99,7 +109,10 @@ class ReleaseConfigTestCase(ConfigTestCase):
         )
 
     def test_only_config_base_product_short(self):
-        cfg = load_config(PKGSET_REPOS, base_product_short="bp",)
+        cfg = load_config(
+            PKGSET_REPOS,
+            base_product_short="bp",
+        )
 
         self.assertValidation(
             cfg,
@@ -118,7 +131,10 @@ class ReleaseConfigTestCase(ConfigTestCase):
         )
 
     def test_only_config_base_product_version(self):
-        cfg = load_config(PKGSET_REPOS, base_product_version="1.0",)
+        cfg = load_config(
+            PKGSET_REPOS,
+            base_product_version="1.0",
+        )
 
         self.assertValidation(
             cfg,
@@ -141,19 +157,28 @@ class ReleaseConfigTestCase(ConfigTestCase):
 
 class ImageNameConfigTestCase(ConfigTestCase):
     def test_image_name_simple_string(self):
-        cfg = load_config(PKGSET_REPOS, image_name_format="foobar",)
+        cfg = load_config(
+            PKGSET_REPOS,
+            image_name_format="foobar",
+        )
 
         self.assertValidation(cfg, [])
 
     def test_image_name_variant_mapping(self):
-        cfg = load_config(PKGSET_REPOS, image_name_format={"^Server$": "foobar"},)
+        cfg = load_config(
+            PKGSET_REPOS,
+            image_name_format={"^Server$": "foobar"},
+        )
 
         self.assertValidation(cfg, [])
 
 
 class RunrootConfigTestCase(ConfigTestCase):
     def test_set_runroot_true(self):
-        cfg = load_config(PKGSET_REPOS, runroot=True,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            runroot=True,
+        )
 
         self.assertValidation(
             cfg,
@@ -163,7 +188,10 @@ class RunrootConfigTestCase(ConfigTestCase):
         )
 
     def test_set_runroot_false(self):
-        cfg = load_config(PKGSET_REPOS, runroot=False,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            runroot=False,
+        )
 
         self.assertValidation(
             cfg,
@@ -175,7 +203,10 @@ class RunrootConfigTestCase(ConfigTestCase):
 
 class BuildinstallConfigTestCase(ConfigTestCase):
     def test_bootable_deprecated(self):
-        cfg = load_config(PKGSET_REPOS, bootable=True,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            bootable=True,
+        )
 
         self.assertValidation(
             cfg,
@@ -185,7 +216,10 @@ class BuildinstallConfigTestCase(ConfigTestCase):
         )
 
     def test_buildinstall_method_without_bootable(self):
-        cfg = load_config(PKGSET_REPOS, buildinstall_method="lorax",)
+        cfg = load_config(
+            PKGSET_REPOS,
+            buildinstall_method="lorax",
+        )
 
         self.assertValidation(cfg, [])
 
@@ -231,7 +265,9 @@ class BuildinstallConfigTestCase(ConfigTestCase):
 class CreaterepoConfigTestCase(ConfigTestCase):
     def test_validate_minimal_pkgset_koji(self):
         cfg = load_config(
-            pkgset_source="koji", pkgset_koji_tag="f25", product_id_allow_missing=True,
+            pkgset_source="koji",
+            pkgset_koji_tag="f25",
+            product_id_allow_missing=True,
         )
 
         self.assertValidation(
@@ -242,14 +278,20 @@ class CreaterepoConfigTestCase(ConfigTestCase):
 
 class GatherConfigTestCase(ConfigTestCase):
     def test_dnf_backend_is_default_on_py3(self):
-        cfg = load_config(pkgset_source="koji", pkgset_koji_tag="f27",)
+        cfg = load_config(
+            pkgset_source="koji",
+            pkgset_koji_tag="f27",
+        )
 
         with mock.patch("six.PY2", new=False):
             self.assertValidation(cfg, [])
         self.assertEqual(cfg["gather_backend"], "dnf")
 
     def test_yum_backend_is_default_on_py2(self):
-        cfg = load_config(pkgset_source="koji", pkgset_koji_tag="f27",)
+        cfg = load_config(
+            pkgset_source="koji",
+            pkgset_koji_tag="f27",
+        )
 
         with mock.patch("six.PY2", new=True):
             self.assertValidation(cfg, [])
@@ -257,7 +299,9 @@ class GatherConfigTestCase(ConfigTestCase):
 
     def test_yum_backend_is_rejected_on_py3(self):
         cfg = load_config(
-            pkgset_source="koji", pkgset_koji_tag="f27", gather_backend="yum",
+            pkgset_source="koji",
+            pkgset_koji_tag="f27",
+            gather_backend="yum",
         )
 
         with mock.patch("six.PY2", new=False):
@@ -402,7 +446,10 @@ class LiveMediaConfigTestCase(ConfigTestCase):
         self.assertEqual(cfg["live_media_ksurl"], "git://example.com/repo.git#CAFE")
 
     def test_global_config_null_release(self):
-        cfg = load_config(PKGSET_REPOS, live_media_release=None,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            live_media_release=None,
+        )
 
         self.assertValidation(cfg)
 
@@ -429,7 +476,8 @@ class TestRegexValidation(ConfigTestCase):
 class RepoclosureTestCase(ConfigTestCase):
     def test_invalid_backend(self):
         cfg = load_config(
-            PKGSET_REPOS, repoclosure_backend="fnd",  # Intentionally with a typo
+            PKGSET_REPOS,
+            repoclosure_backend="fnd",  # Intentionally with a typo
         )
 
         options = ["yum", "dnf"] if six.PY2 else ["dnf"]
@@ -445,7 +493,10 @@ class RepoclosureTestCase(ConfigTestCase):
 class VariantAsLookasideTestCase(ConfigTestCase):
     def test_empty(self):
         variant_as_lookaside = []
-        cfg = load_config(PKGSET_REPOS, variant_as_lookaside=variant_as_lookaside,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            variant_as_lookaside=variant_as_lookaside,
+        )
         self.assertValidation(cfg)
 
     def test_basic(self):
@@ -454,14 +505,20 @@ class VariantAsLookasideTestCase(ConfigTestCase):
             ("Server", "Client"),
             ("Everything", "Spin"),
         ]
-        cfg = load_config(PKGSET_REPOS, variant_as_lookaside=variant_as_lookaside,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            variant_as_lookaside=variant_as_lookaside,
+        )
         self.assertValidation(cfg)
 
 
 class SkipPhasesTestCase(ConfigTestCase):
     def test_empty(self):
         skip_phases = []
-        cfg = load_config(PKGSET_REPOS, skip_phases=skip_phases,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            skip_phases=skip_phases,
+        )
         self.assertValidation(cfg)
 
     def test_basic(self):
@@ -469,7 +526,10 @@ class SkipPhasesTestCase(ConfigTestCase):
             "buildinstall",
             "gather",
         ]
-        cfg = load_config(PKGSET_REPOS, skip_phases=skip_phases,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            skip_phases=skip_phases,
+        )
         self.assertValidation(cfg)
 
     def test_bad_phase_name(self):
@@ -477,5 +537,8 @@ class SkipPhasesTestCase(ConfigTestCase):
             "gather",
             "non-existing-phase_name",
         ]
-        cfg = load_config(PKGSET_REPOS, skip_phases=skip_phases,)
+        cfg = load_config(
+            PKGSET_REPOS,
+            skip_phases=skip_phases,
+        )
         self.assertNotEqual(checks.validate(cfg), ([], []))

tests/test_createrepophase.py

@@ -158,7 +158,9 @@ def make_mocked_modifyrepo_cmd(tc, module_artifacts):
         for ms in module_streams:
             tc.assertIn(ms.get_stream_name(), module_artifacts)
             six.assertCountEqual(
-                tc, ms.get_rpm_artifacts(), module_artifacts[ms.get_stream_name()],
+                tc,
+                ms.get_rpm_artifacts(),
+                module_artifacts[ms.get_stream_name()],
             )
 
     return mocked_modifyrepo_cmd

tests/test_extra_isos_phase.py

@@ -596,7 +596,9 @@ class GetExtraFilesTest(helpers.PungiTestCase):
             get_file.call_args_list,
             [
                 mock.call(
-                    cfg1, os.path.join(self.dir, "legalese"), compose=self.compose,
+                    cfg1,
+                    os.path.join(self.dir, "legalese"),
+                    compose=self.compose,
                 ),
                 mock.call(cfg2, self.dir, compose=self.compose),
             ],
@@ -832,7 +834,8 @@ class GetIsoContentsTest(helpers.PungiTestCase):
                     ["Client"],
                     os.path.join(self.topdir, "compose/Server/source/tree/.treeinfo"),
                     os.path.join(
-                        self.topdir, "work/src/Server/extra-iso-extra-files/.treeinfo",
+                        self.topdir,
+                        "work/src/Server/extra-iso-extra-files/.treeinfo",
                     ),
                 ),
             ],

tests/test_fus_wrapper.py

@@ -147,7 +147,8 @@ class TestParseOutput(unittest.TestCase):
         touch(self.file, "*pkg-1.0-1.x86_64@repo-0\n")
         packages, modules = fus.parse_output(self.file)
         self.assertEqual(
-            packages, set([("pkg-1.0-1", "x86_64", frozenset(["modular"]))]),
+            packages,
+            set([("pkg-1.0-1", "x86_64", frozenset(["modular"]))]),
         )
         self.assertEqual(modules, set())
 

tests/test_gather.py

@@ -2620,5 +2620,7 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
         six.assertCountEqual(self, pkg_map["rpm"], [])
         six.assertCountEqual(self, pkg_map["srpm"], [])
         six.assertCountEqual(
-            self, pkg_map["debuginfo"], ["dummy-bash-debuginfo-4.2.37-6.x86_64.rpm"],
+            self,
+            pkg_map["debuginfo"],
+            ["dummy-bash-debuginfo-4.2.37-6.x86_64.rpm"],
         )

tests/test_gather_method_hybrid.py

@@ -350,7 +350,8 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
             ],
         )
         self.assertEqual(
-            wc.call_args_list, [mock.call(self.config1, ["mod:master"], [])],
+            wc.call_args_list,
+            [mock.call(self.config1, ["mod:master"], [])],
         )
         self.assertEqual(
             gc.call_args_list,
@@ -454,7 +455,8 @@ class TestRunSolver(HelperMixin, helpers.PungiTestCase):
             ],
         )
         self.assertEqual(
-            wc.call_args_list, [mock.call(self.config1, [], ["pkg"])],
+            wc.call_args_list,
+            [mock.call(self.config1, [], ["pkg"])],
         )
         self.assertEqual(
             gc.call_args_list,

tests/test_image_container_phase.py

@@ -168,7 +168,10 @@ class ImageContainerThreadTest(helpers.PungiTestCase):
             [
                 mock.call.login(),
                 mock.call.koji_proxy.buildContainer(
-                    cfg["url"], cfg["target"], opts, priority=None,
+                    cfg["url"],
+                    cfg["target"],
+                    opts,
+                    priority=None,
                 ),
                 mock.call.watch_task(
                     12345,

tests/test_koji_wrapper.py

@@ -39,7 +39,9 @@ class KojiWrapperBaseTestCase(unittest.TestCase):
             koji.get_profile_module = mock.Mock(
                 return_value=mock.Mock(
                     config=DumbMock(
-                        server="koji.example.com", authtype="kerberos", cert="",
+                        server="koji.example.com",
+                        authtype="kerberos",
+                        cert="",
                     ),
                     pathinfo=mock.Mock(
                         work=mock.Mock(return_value="/koji"),

tests/test_osbs_phase.py

@@ -53,7 +53,8 @@ class OSBSPhaseTest(helpers.PungiTestCase):
             self.assertEqual(data, phase.pool.registries)
 
         self.assertEqual(
-            compose.notifier.call_args_list, [],
+            compose.notifier.call_args_list,
+            [],
         )
 
 

tests/test_runroot.py

@@ -204,7 +204,8 @@ class TestRunrootKoji(helpers.PungiTestCase):
     def setUp(self):
         super(TestRunrootKoji, self).setUp()
         self.compose = helpers.DummyCompose(
-            self.topdir, {"runroot": True, "runroot_tag": "f28-build"},
+            self.topdir,
+            {"runroot": True, "runroot_tag": "f28-build"},
         )
 
         self.runroot = Runroot(self.compose)

tests/test_test_phase.py

@@ -267,7 +267,8 @@ class TestCheckImageSanity(PungiTestCase):
     @mock.patch("pungi.phases.test.check_sanity", new=mock.Mock())
     def test_too_big_unified_strict(self):
         compose = DummyCompose(
-            self.topdir, {"createiso_max_size_is_strict": [(".*", {"*": True})]},
+            self.topdir,
+            {"createiso_max_size_is_strict": [(".*", {"*": True})]},
         )
         compose.image.format = "iso"
         compose.image.bootable = False

tests/test_util.py

@@ -183,7 +183,8 @@ class TestGitRefResolver(unittest.TestCase):
     def test_resolver_offline_branch(self, mock_resolve_url, mock_resolve_ref):
         resolver = util.GitUrlResolver(offline=True)
         self.assertEqual(
-            resolver("http://example.com/repo.git", "master"), "master",
+            resolver("http://example.com/repo.git", "master"),
+            "master",
         )
         self.assertEqual(mock_resolve_url.call_args_list, [])
         self.assertEqual(mock_resolve_ref.call_args_list, [])
@@ -935,7 +936,8 @@ class TestVersionGenerator(unittest.TestCase):
 
     def test_version_from_version(self):
         self.assertEqual(
-            util.version_generator(self.compose, "!VERSION_FROM_VERSION"), "8",
+            util.version_generator(self.compose, "!VERSION_FROM_VERSION"),
+            "8",
         )