Remove unused code in python_gardenlinux_lib module

Signed-off-by: Tobias Wolf <[email protected]>

Author: NotTheEvilOne

src/gardenlinux/apt/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from .debsource import Debsrc, DebsrcFile
+
+__all__ = ["Parser"]

src/gardenlinux/apt/parse_debsource.py src/gardenlinux/apt/debsource.pysrc/gardenlinux/apt/parse_debsource.py renamed to src/gardenlinux/apt/debsource.py

@@ -1,4 +1,3 @@
-from .git import Git
 from .version import Version
 
-__all__ = ["Git", "Version"]
+__all__ = ["Version"]

src/python_gardenlinux_lib/__init__.py

@@ -36,53 +36,6 @@ def get_gardenlinux_commit(gardenlinux_root: str, limit: Optional[int] = None) -
     else:
         return commit_str
 
-def get_features_dict(
-    cname: str, gardenlinux_root: str, feature_dir_name: str = "features"
-) -> dict:
-    """
-    :param str cname: the target cname to get the feature dict for
-    :param str gardenlinux_root: path of garden linux src root
-    :return: dict with list of features for a given cname, split into platform, element and flag
-
-    """
-
-    return Parser(gardenlinux_root, feature_dir_name).filter_as_dict(cname)
-
-def get_features_graph(
-    cname: str, gardenlinux_root: str, feature_dir_name: str = "features"
-) -> networkx.Graph:
-    """
-    :param str cname: the target cname to get the feature dict for
-    :param str gardenlinux_root: path of garden linux src root
-    :return: list of features for a given cname
-
-    """
-
-    return Parser(gardenlinux_root, feature_dir_name).filter(cname)
-
-def get_features_list(
-    cname: str, gardenlinux_root: str, feature_dir_name: str = "features"
-) -> list:
-    """
-    :param str cname: the target cname to get the feature dict for
-    :param str gardenlinux_root: path of garden linux src root
-    :return: list of features for a given cname
-
-    """
-
-    return Parser(gardenlinux_root, feature_dir_name).filter_as_list(cname)
-
-def get_features(
-    cname: str, gardenlinux_root: str, feature_dir_name: str = "features"
-) -> str:
-    """
-    :param str cname: the target cname to get the feature set for
-    :param str gardenlinux_root: path of garden linux src root
-    :return: a comma separated string with the expanded feature set for the cname
-    """
-
-    return Parser(gardenlinux_root, feature_dir_name).filter_as_string(cname)
-
 def construct_layer_metadata(
     filetype: str, cname: str, version: str, arch: str, commit: str
 ) -> dict:
@@ -123,7 +76,7 @@ def get_file_set_from_cname(cname: str, version: str, arch: str, gardenlinux_roo
     :return: set of file names for a given cname
     """
     file_set = set()
-    features_by_type = get_features_dict(cname, gardenlinux_root)
+    features_by_type = Parser(gardenlinux_root).filter_as_dict(cname)
     commit_str = get_gardenlinux_commit(gardenlinux_root, 8)
 
     if commit_str == "local":

src/python_gardenlinux_lib/features/parse_features.py

@@ -4,8 +4,7 @@
 import requests
 from pathlib import Path
 
-from .logger import LoggerSetup
-from .features.parse_features import get_features
+from gardenlinux.logger import LoggerSetup
 
 
 class Version:

src/python_gardenlinux_lib/flavors/parse_flavors.py

@@ -1,6 +1,6 @@
 import pytest
 
-from python_gardenlinux_lib.features.parse_features import get_features_dict
+from gardenlinux.features import Parser
 from tests.conftest import GL_ROOT_DIR
 
 
@@ -66,5 +66,5 @@ def test_get_features_dict(input_cname: str, expected_output: dict):
     features have changed since writing this test. In this case, update the expected output accordingly.
     You can print the output of get_features_dict so you have the dict in the expected format.
     """
-    features_dict = get_features_dict(input_cname, GL_ROOT_DIR)
+    features_dict = Parser(GL_ROOT_DIR).filter_as_dict(input_cname)
     assert features_dict == expected_output

src/python_gardenlinux_lib/version.py

@@ -1,4 +1,4 @@
-from python_gardenlinux_lib.apt.parse_debsource import DebsrcFile
+from gardenlinux.apt import DebsrcFile
 import io
 
 test_data = """Package: vim

tests/test_get_features_dict.py

@@ -1,8 +1,9 @@
 import pytest
 import os
 
+from gardenlinux.features import Parser
+from python_gardenlinux_lib.features.parse_features import get_oci_metadata
 from python_gardenlinux_lib.oras.registry import GlociRegistry
-from python_gardenlinux_lib.features import parse_features
 
 CONTAINER_NAME_ZOT_EXAMPLE = "127.0.0.1:18081/gardenlinux-example"
 GARDENLINUX_ROOT_DIR_EXAMPLE = "test-data/gardenlinux/"
@@ -27,12 +28,12 @@
     ],
 )
 def test_push_example(version, cname, arch):
-    oci_metadata = parse_features.get_oci_metadata(
+    oci_metadata = get_oci_metadata(
         cname, version, arch, GARDENLINUX_ROOT_DIR_EXAMPLE
     )
     container_name = f"{CONTAINER_NAME_ZOT_EXAMPLE}:{version}"
     a_registry = GlociRegistry(container_name=container_name, insecure=True)
-    features = parse_features.get_features(cname, GARDENLINUX_ROOT_DIR_EXAMPLE)
+    features = Parser(GARDENLINUX_ROOT_DIR_EXAMPLE).filter(cname)
     a_registry.push_image_manifest(
         arch,
         cname,