diff --git a/pungi/phases/createrepo.py b/pungi/phases/createrepo.py
index 83028bb0..84ea1f9a 100644
--- a/pungi/phases/createrepo.py
+++ b/pungi/phases/createrepo.py
@@ -16,7 +16,6 @@
 
 __all__ = ("create_variant_repo",)
 
-
 import copy
 import errno
 import glob
@@ -25,18 +24,20 @@ import shutil
 import threading
 import xml.dom.minidom
 
-from kobo.threads import ThreadPool, WorkerThread
-from kobo.shortcuts import run, relative_path
-
-from ..wrappers.scm import get_dir_from_scm
-from ..wrappers.createrepo import CreaterepoWrapper
-from .base import PhaseBase
-from ..util import get_arch_variant_data, temp_dir, read_single_module_stream_from_file
-from ..module_util import Modulemd, collect_module_defaults
-
-import productmd.rpms
 import productmd.modules
+import productmd.rpms
+from kobo.shortcuts import relative_path, run
+from kobo.threads import ThreadPool, WorkerThread
 
+from ..module_util import Modulemd, collect_module_defaults
+from ..util import (
+    get_arch_variant_data,
+    read_single_module_stream_from_file,
+    temp_dir,
+)
+from ..wrappers.createrepo import CreaterepoWrapper
+from ..wrappers.scm import get_dir_from_scm
+from .base import PhaseBase
 
 createrepo_lock = threading.Lock()
 createrepo_dirs = set()
diff --git a/tests/test_createrepophase.py b/tests/test_createrepophase.py
index 963984bc..6475c75a 100644
--- a/tests/test_createrepophase.py
+++ b/tests/test_createrepophase.py
@@ -1,24 +1,24 @@
 # -*- coding: utf-8 -*-
 
-
 try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
 
 import glob
 import os
+
+import mock
 import six
 
+from pungi.module_util import Modulemd
 from pungi.phases.createrepo import (
     CreaterepoPhase,
+    ModulesMetadata,
     create_variant_repo,
     get_productids_from_scm,
-    ModulesMetadata,
 )
 from tests.helpers import DummyCompose, PungiTestCase, copy_fixture, touch
-from pungi.module_util import Modulemd
 
 
 class TestCreaterepoPhase(PungiTestCase):