fix: Remove dependency on container-transform since it's included

KnpLabs · Jun 18, 2024 · dce6a98 · dce6a98
1 parent 10d48a9
commit dce6a98
Show file tree

Hide file tree

Showing 10 changed files with 661 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,3 @@
 .test-results/
 build/
 dist/
-Pipfile.lock
diff --git a/Pipfile b/Pipfile
@@ -11,7 +11,6 @@ pytest-cov = "*"
 
 [packages]
 kitipy = {path = ".", editable = true}
-container-transform = {editable = true, git = "https://github.com/Swanoo/container-transform.git", ref = "main"}
 boto3-stubs = {extras = ["cloudfront", "ecr", "ecs", "secretsmanager"], version = "==1.26.62"}
 
 [requires]

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/kitipy.egg-info/PKG-INFO b/kitipy.egg-info/PKG-INFO
@@ -6,9 +6,9 @@ License: MIT
 Requires-Dist: boto3-stubs[ecr]==1.26.62
 Requires-Dist: boto3-stubs[ecs]==1.26.62
 Requires-Dist: boto3-stubs[secretsmanager]==1.26.62
-Requires-Dist: boto3==1.23.7
+Requires-Dist: boto3==1.26.62
 Requires-Dist: click==7.0.0
-Requires-Dist: Jinja2==2.7.0
+Requires-Dist: Jinja2==3.1.4
 Requires-Dist: paramiko==2.6.0
 Requires-Dist: PyYAML==5.1.0
 Requires-Dist: requests==2.27.1

diff --git a/kitipy.egg-info/requires.txt b/kitipy.egg-info/requires.txt
@@ -1,9 +1,9 @@
 boto3-stubs[ecr]==1.26.62
 boto3-stubs[ecs]==1.26.62
 boto3-stubs[secretsmanager]==1.26.62
-boto3==1.23.7
+boto3==1.26.62
 click==7.0.0
-Jinja2==2.7.0
+Jinja2==3.1.4
 paramiko==2.6.0
 PyYAML==5.1.0
 requests==2.27.1

diff --git a/kitipy/libs/container_transform/chronos.py b/kitipy/libs/container_transform/chronos.py
@@ -6,7 +6,8 @@
 
 from copy import deepcopy
 from functools import reduce
-from collections import Mapping, defaultdict
+from collections import defaultdict
+from collections.abc import Mapping
 
 from .schema import TransformationTypes, ARG_MAP
 from .transformer import BaseTransformer

diff --git a/kitipy/libs/container_transform/kubernetes.py b/kitipy/libs/container_transform/kubernetes.py
@@ -3,7 +3,8 @@
 
 from copy import deepcopy
 from functools import reduce
-from collections import Mapping, defaultdict
+from collections import defaultdict
+from collections.abc import Mapping
 
 import yaml
 

diff --git a/kitipy/libs/container_transform/marathon.py b/kitipy/libs/container_transform/marathon.py
@@ -4,7 +4,8 @@
 
 from copy import deepcopy
 from functools import reduce
-from collections import Mapping, defaultdict
+from collections import defaultdict
+from collections.abc import Mapping
 
 from .schema import TransformationTypes, ARG_MAP
 from .transformer import BaseTransformer

diff --git a/kitipy/utils.py b/kitipy/utils.py
@@ -139,7 +139,7 @@ def on_end():
 
 
 def append_cmd_flags(cmd: str, **kwargs) -> str:
-    """Build a command string by appending flags in \**kwargs.
+    """Build a command string by appending flags in kwargs.
 
     Args:
         cmd (str): The base command to prefix with the given flags.

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
         "boto3-stubs[secretsmanager]==1.26.62",
         "boto3==1.26.62",
         "click==7.0.0",
-        "Jinja2==2.7.0",
+        "Jinja2==3.1.4",
         "paramiko==2.6.0",
         "PyYAML==5.1.0",
         "requests==2.27.1",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,3 @@ @@
     .test-results/
     build/
     dist/
-    Pipfile.lock