Merge branch master into feat/omegaconf-inventory

neXenio · Feb 7, 2024 · f7ed0a4 · f7ed0a4
2 parents 49f2147 + 8fe5998
commit f7ed0a4
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 104 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/kapitan/inventory/inventory.py b/kapitan/inventory/inventory.py
@@ -13,7 +13,7 @@
 from typing import overload, Union
 
 from kapitan.errors import KapitanError
-from kapitan.reclass.reclass.values import item
+from reclass.values import item
 
 logger = logging.getLogger(__name__)
 

diff --git a/kapitan/reclass b/kapitan/reclass
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,6 @@ license = "Apache-2.0"
 version = "0.33.0"
 packages = [
     { include = "kapitan" },
-    { include = "kapitan/reclass" },
 ]
 
 [tool.poetry.scripts]
@@ -64,7 +63,8 @@ gitdb = "^4.0.10"
 packaging = "^23.0"
 typing-extensions = "^4.0.0"
 gojsonnet = { version = "^0.20.0", optional = true }
-docker = { version = ">=5,<7", optional = true }
+docker = { version = ">=5,<8", optional = true }
+reclass = {git = "https://github.com/kapicorp/reclass"}
 
 [tool.poetry.extras]
 gojsonnet = ["gojsonnet"]
@@ -76,7 +76,6 @@ target-version = ['py310']
 exclude = '''
 (
   /(
-      .*reclass.*
     | .*version.py
   )
 )

diff --git a/tests/test_dependency_manager.py b/tests/test_dependency_manager.py
@@ -79,79 +79,6 @@ def test_clone_repo_subdir(self):
         rmtree(temp_dir)
         rmtree(output_dir)
 
-    def test_clone_repo_submodules_false(self):
-        """
-        Tests cloning git repo and check that submodule folder is empty
-        """
-        temp_dir = tempfile.mkdtemp()
-        output_dir = tempfile.mkdtemp()
-        source = "https://github.com/kapicorp/kapitan.git"
-        dep = [
-            {
-                "output_path": output_dir,
-                "ref": "master",
-                "submodules": False,
-            }
-        ]
-        fetch_git_dependency((source, dep), temp_dir, force=False)
-        self.assertEqual(os.listdir(os.path.join(output_dir, "kapitan", "reclass")), [])
-        rmtree(temp_dir)
-        rmtree(output_dir)
-
-    def test_clone_repo_without_submodules(self):
-        """
-        Tests cloning a git repo without any submodules
-        """
-        temp_dir = tempfile.mkdtemp()
-        output_dir = tempfile.mkdtemp()
-        source = "https://github.com/kapicorp/reclass.git"
-        dep = [
-            {
-                "output_path": output_dir,
-                "ref": "master",
-            }
-        ]
-        fetch_git_dependency((source, dep), temp_dir, force=False)
-        self.assertTrue(os.path.isdir(os.path.join(output_dir, "reclass")))
-        rmtree(temp_dir)
-        rmtree(output_dir)
-
-    def test_clone_repo_with_submodules(self):
-        """
-        Tests cloning git repo and initialize its' submodule
-        """
-        temp_dir = tempfile.mkdtemp()
-        output_dir = tempfile.mkdtemp()
-        source = "https://github.com/kapicorp/kapitan.git"
-        dep = [
-            {
-                "output_path": output_dir,
-                "ref": "master",
-            }
-        ]
-        fetch_git_dependency((source, dep), temp_dir, force=False)
-        self.assertTrue(os.listdir(os.path.join(output_dir, "kapitan", "reclass")))
-        rmtree(temp_dir)
-        rmtree(output_dir)
-
-    def test_clone_repo_with_submodule_subdir(self):
-        """
-        Tests cloning subdir in a git repo and initialize its' submodule
-        """
-        temp_dir = tempfile.mkdtemp()
-        output_dir = tempfile.mkdtemp()
-        source = "https://github.com/kapicorp/kapitan.git"
-        dep = [
-            {
-                "output_path": output_dir,
-                "ref": "master",
-                "subdir": "kapitan",
-            }
-        ]
-        fetch_git_dependency((source, dep), temp_dir, force=False)
-        self.assertTrue(os.listdir(os.path.join(output_dir, "reclass")))
-        rmtree(temp_dir)
-        rmtree(output_dir)
 
     def test_fetch_helm_chart(self):
         """