utils: move to klplib package

Signed-off-by: Vincenzo MEZZELA <[email protected]>
SUSE · Jan 17, 2025 · fe61e6b · fe61e6b
1 parent 57d7c13
commit fe61e6b
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/klpbuild/extractor.py b/klpbuild/extractor.py
@@ -20,7 +20,7 @@
 
 from natsort import natsorted
 
-from klpbuild import utils
+from klpbuild.klplib import utils
 from klpbuild.config import Config
 from klpbuild.klplib.templ import TemplateGen
 

diff --git a/klpbuild/klplib/cmd.py b/klpbuild/klplib/cmd.py
@@ -5,7 +5,7 @@
 
 import argparse
 
-from klpbuild.utils import ARCHS
+from klpbuild.klplib.utils import ARCHS
 
 
 def create_parser() -> argparse.ArgumentParser:

diff --git a/klpbuild/klplib/codestream.py b/klpbuild/klplib/codestream.py
@@ -6,7 +6,7 @@
 from pathlib import Path, PurePath
 import re
 
-from klpbuild.utils import ARCH, is_mod, get_all_symbols_from_object
+from klpbuild.klplib.utils import ARCH, is_mod, get_all_symbols_from_object
 
 class Codestream:
     __slots__ = ("data_path", "lp_path", "lp_name", "sle", "sp", "update", "rt",

diff --git a/klpbuild/klplib/ibs.py b/klpbuild/klplib/ibs.py
@@ -24,7 +24,7 @@
 from osctiny import Osc
 
 from klpbuild.config import Config
-from klpbuild.utils import ARCH, ARCHS, get_all_symbols_from_object, get_elf_object, get_elf_modinfo_entry, get_cs_branch, get_kgraft_branch, filter_codestreams
+from klpbuild.klplib.utils import ARCH, ARCHS, get_all_symbols_from_object, get_elf_object, get_elf_modinfo_entry, get_cs_branch, get_kgraft_branch, filter_codestreams
 
 class IBS(Config):
     def __init__(self, lp_name, lp_filter):

diff --git a/klpbuild/klplib/ksrc.py b/klpbuild/klplib/ksrc.py
@@ -15,7 +15,7 @@
 import requests
 from natsort import natsorted
 
-from klpbuild import utils
+from klpbuild.klplib import utils
 from klpbuild.config import Config
 from klpbuild.klplib.codestream import Codestream
 from klpbuild.klplib.ibs import IBS

diff --git a/klpbuild/klplib/templ.py b/klpbuild/klplib/templ.py
@@ -10,7 +10,7 @@
 from mako.template import Template
 
 from klpbuild.config import Config
-from klpbuild.utils import ARCHS, fix_mod_string, get_mail
+from klpbuild.klplib.utils import ARCHS, fix_mod_string, get_mail
 
 TEMPL_H = """\
 #ifndef _${ fname.upper() }_H

diff --git a/klpbuild/utils.py → klpbuild/klplib/utils.py b/klpbuild/utils.py → klpbuild/klplib/utils.py
diff --git a/klpbuild/plugins/inline.py b/klpbuild/plugins/inline.py
@@ -7,7 +7,7 @@
 import subprocess
 
 from klpbuild.config import Config
-from klpbuild.utils import filter_codestreams
+from klpbuild.klplib.utils import filter_codestreams
 
 
 class Inliner(Config):

diff --git a/klpbuild/plugins/setup.py b/klpbuild/plugins/setup.py
@@ -9,7 +9,7 @@
 
 from natsort import natsorted
 
-from klpbuild import utils
+from klpbuild.klplib import utils
 from klpbuild.config import Config
 from klpbuild.klplib.ksrc import GitHelper
 

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -4,7 +4,7 @@
 # Author: Marcos Paulo de Souza <[email protected]>
 
 from klpbuild.klplib.codestream import Codestream
-from klpbuild.utils import filter_codestreams
+from klpbuild.klplib.utils import filter_codestreams
 
 
 def test_filter():

diff --git a/tests/test_extract.py b/tests/test_extract.py
@@ -8,7 +8,7 @@
 
 from klpbuild.extractor import Extractor
 from klpbuild.plugins.setup import Setup
-from klpbuild import utils
+from klpbuild.klplib import utils
 
 
 def test_detect_file_without_ftrace_support(caplog):

diff --git a/tests/test_setup.py b/tests/test_setup.py
@@ -6,8 +6,8 @@
 import pytest
 
 from klpbuild.plugins.setup import Setup
-from klpbuild import utils
 from tests.utils import get_codestreams_file
+from klpbuild.klplib import utils
 
 CS = "15.5u19"
 DEFAULT_DATA = {"cve": None, "lp_filter": CS, "lp_skips": None, "conf": "CONFIG_TUN", "no_check": False}

diff --git a/tests/test_templ.py b/tests/test_templ.py
@@ -7,7 +7,7 @@
 
 from klpbuild.extractor import Extractor
 from klpbuild.plugins.setup import Setup
-from klpbuild import utils
+from klpbuild.klplib import utils
 from tests.utils import get_file_content
 
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,4 +1,4 @@
-from klpbuild import utils
+from klpbuild.klplib import utils
 from klpbuild.klplib.codestream import Codestream