🔥 remove *kappa* usage, replacing with similar internal representation (#1386)

* 🔥 remove *kappa* usage, replacing with similar internal representation.
🔧 Add type annotations (to fix pre-commit issues)

* ✅ updated to address failing testcase

* 🔧 update to use pathlib Path objects in-place of strings

* 🔧 ✅ align test cases file names from test*/tests* -> test_*, change tests.py -> test_core.py
🔧 update Makefile to reflect changes in test filenames.

* 🔧 revert back unnecessary typing of test settings.py files.
🔥 remove unused test_async_old.py file.

* 🔧 replace os.path usage with Path usage

* 🔥 🔧 removing unnecessary str() conversion of pathlib objects when using shutil.

* 🔥 🔧 replace print() statements with logger.
🔧 add types where unclear

* Update zappa/core.py

Co-authored-by: Copilot <[email protected]>

* 🔥 remove unnecessary func introduction

---------

Co-authored-by: shane <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

Makefile

@@ -58,39 +58,39 @@ flake:
 	flake8 zappa --count --exit-zero --max-complexity=55 --max-line-length=127 --statistics --ignore F403,F405,E203,E231,E252,W503
 
 test-docs:
-	pytest tests/tests_docs.py --cov=zappa --durations=0
+	pytest tests/test_docs.py --cov=zappa --durations=0
 
 test-handler:
 	pytest tests/test_handler.py --cov=zappa --durations=0
 
 test-middleware:
-	pytest tests/tests_middleware.py --cov=zappa --durations=0
+	pytest tests/test_middleware.py --cov=zappa --durations=0
 
 test-placebo:
-	pytest tests/tests_placebo.py --cov=zappa --durations=0
+	pytest tests/test_placebo.py --cov=zappa --durations=0
 
 test-async:
-	pytest tests/tests_async.py --cov=zappa --durations=0
+	pytest tests/test_async.py --cov=zappa --durations=0
 
 test-general:
-	pytest tests/tests.py --cov=zappa --durations=0
+	pytest tests/test_core.py --cov=zappa --durations=0
 
 test-utilities:
-	pytest tests/tests_utilities.py --cov=zappa --durations=0
+	pytest tests/test_utilities.py --cov=zappa --durations=0
 
 coverage-report:
 	coverage report --include="*/zappa*"
 
 tests:
 	make clean
 	pytest \
-		tests/tests_docs.py \
+		tests/test_docs.py \
 		tests/test_handler.py \
-		tests/tests_middleware.py \
-		tests/tests_placebo.py \
-		tests/tests_async.py \
-		tests/tests.py \
-		tests/tests_utilities.py \
+		tests/test_middleware.py \
+		tests/test_placebo.py \
+		tests/test_async.py \
+		tests/test_core.py \
+		tests/test_utilities.py \
 		--cov=zappa \
 		--cov-report=xml \
 		--durations=0

Pipfile

@@ -26,7 +26,6 @@ boto3 = ">=1.17.28"
 durationpy = "*"
 hjson = "*"
 jmespath = "*"
-kappa = "==0.6.0"
 pip = ">=24.0.0"
 placebo = "<0.10"
 python-dateutil = "*"

tests/tests_async.py renamed to tests/test_async.py

@@ -8,7 +8,6 @@
 import re
 import shutil
 import string
-import subprocess
 import sys
 import tempfile
 import unittest
@@ -24,7 +23,6 @@
 import botocore.stub
 import flask
 import mock
-import pytest
 from click.exceptions import ClickException
 from click.globals import resolve_color_default
 from packaging import version

tests/tests.py renamed to tests/test_core.py

@@ -1,3 +1,6 @@
-def handler_for_events(event, context):
+from typing import Any
+
+
+def handler_for_events(event: Any, context: Any) -> bool:
     print("Event:", event)
     return True

tests/tests_docs.py renamed to tests/test_docs.py

@@ -1,4 +1,5 @@
 import unittest
+from typing import Any, Tuple
 
 from mock import Mock
 
@@ -8,35 +9,35 @@
 from .utils import is_base64
 
 
-def no_args():
+def no_args() -> None:
     return
 
 
-def one_arg(first):
+def one_arg(first: Any) -> Any:
     return first
 
 
-def two_args(first, second):
+def two_args(first: Any, second: Any) -> Tuple[Any, Any]:
     return first, second
 
 
-def var_args(*args):
+def var_args(*args: Any) -> Tuple[Any, ...]:
     return args
 
 
-def var_args_with_one(first, *args):
+def var_args_with_one(first: Any, *args: Any) -> Tuple[Any, Any]:
     return first, args[0]
 
 
-def unsupported(first, second, third):
+def unsupported(first: Any, second: Any, third: Any) -> Tuple[Any, Any, Any]:
     return first, second, third
 
 
-def raises_exception(*args, **kwargs):
+def raises_exception(*args: Any, **kwargs: Any) -> None:
     raise Exception("app exception")
 
 
-def handle_bot_intent(event, context):
+def handle_bot_intent(event: Any, context: Any) -> str:
     return "Success"
 
 

tests/test_event_script_app.py

@@ -1,7 +1,6 @@
 import json
 import os
 import re
-import shutil
 import tempfile
 import unittest
 from pathlib import Path
@@ -79,8 +78,8 @@ def test_copy_editable_packages(self, mock_find_packages):
                     # are copied to the temp package directory
                     # find_packages() is called on the egg_path to find the packages
                     mock_copytree.assert_called_with(
-                        os.path.join(egg_path, "package"),
-                        os.path.join(temp_package_dir, "package"),
+                        Path(egg_path) / "package",
+                        temp_package_dir / "package",
                         metadata=False,
                         symlinks=False,
                     )