Move libraries to their own package. (#34)

Signed-off-by: Caroline Russell <[email protected]>
AppThreat · Aug 23, 2024 · 18bcfff · 18bcfff
1 parent 86c6648
commit 18bcfff
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include custom_json_diff/bom_diff_template.j2
+include custom_json_diff/lib/bom_diff_template.j2
diff --git a/custom_json_diff/cli.py b/custom_json_diff/cli.py
@@ -3,13 +3,13 @@
 
 from importlib.metadata import version
 
-from custom_json_diff.custom_diff import (
+from custom_json_diff.lib.custom_diff import (
     compare_dicts,
     get_diff,
     perform_bom_diff,
     report_results
 )
-from custom_json_diff.custom_diff_classes import Options
+from custom_json_diff.lib.custom_diff_classes import Options
 
 
 logger = logging.getLogger(__name__)

diff --git a/custom_json_diff/bom_diff_template.j2 → custom_json_diff/lib/bom_diff_template.j2 b/custom_json_diff/bom_diff_template.j2 → custom_json_diff/lib/bom_diff_template.j2
diff --git a/custom_json_diff/custom_diff.py → custom_json_diff/lib/custom_diff.py b/custom_json_diff/custom_diff.py → custom_json_diff/lib/custom_diff.py
@@ -7,13 +7,13 @@
 
 from json_flatten import flatten  # type: ignore
 
-from custom_json_diff.custom_diff_classes import BomDicts, FlatDicts, Options, order_boms
-from custom_json_diff.utils import (
+from custom_json_diff.lib.custom_diff_classes import BomDicts, FlatDicts, Options, order_boms
+from custom_json_diff.lib.utils import (
     export_html_report, export_results, logger, sort_dict_lists
 )
 
 if TYPE_CHECKING:
-    from custom_json_diff.custom_diff_classes import (
+    from custom_json_diff.lib.custom_diff_classes import (
         BomComponent, BomDependency, BomService, BomVdr
     )
 

diff --git a/custom_json_diff/custom_diff_classes.py → custom_json_diff/lib/custom_diff_classes.py b/custom_json_diff/custom_diff_classes.py → custom_json_diff/lib/custom_diff_classes.py
@@ -6,7 +6,7 @@
 
 from json_flatten import unflatten  # type: ignore
 
-from custom_json_diff.utils import (
+from custom_json_diff.lib.utils import (
     compare_bom_refs, compare_date, compare_recommendations, compare_versions, import_config
 )
 

diff --git a/custom_json_diff/utils.py → custom_json_diff/lib/utils.py b/custom_json_diff/utils.py → custom_json_diff/lib/utils.py
@@ -12,7 +12,7 @@
 from jinja2 import Environment
 
 if TYPE_CHECKING:
-    from custom_json_diff.custom_diff_classes import Options
+    from custom_json_diff.lib.custom_diff_classes import Options
 
 
 logger = logging.getLogger(__name__)

diff --git a/pyproject.toml b/pyproject.toml
@@ -44,6 +44,7 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools]
 packages = [
   "custom_json_diff",
+  "custom_json_diff.lib",
   ]
 include-package-data = true
 

diff --git a/test/test_bom_diff.py b/test/test_bom_diff.py
@@ -3,8 +3,8 @@
 
 import pytest
 
-from custom_json_diff.custom_diff import compare_dicts, perform_bom_diff
-from custom_json_diff.custom_diff_classes import (
+from custom_json_diff.lib.custom_diff import compare_dicts, perform_bom_diff
+from custom_json_diff.lib.custom_diff_classes import (
     BomComponent, BomDicts, FlatDicts, Options, BomVdr, BomVdrAffects
 )
 

diff --git a/test/test_custom_json_diff.py b/test/test_custom_json_diff.py
@@ -2,11 +2,11 @@
 
 import pytest
 
-from custom_json_diff.custom_diff import (
+from custom_json_diff.lib.custom_diff import (
     compare_dicts, get_diff, load_json
 )
-from custom_json_diff.utils import sort_dict_lists
-from custom_json_diff.custom_diff_classes import Options
+from custom_json_diff.lib.utils import sort_dict_lists
+from custom_json_diff.lib.custom_diff_classes import Options
 
 
 @pytest.fixture
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include custom_json_diff/bom_diff_template.j2
		include custom_json_diff/lib/bom_diff_template.j2