Merge remote-tracking branch 'origin/main' into add-wrapping-to-clickhouse

Author: bitterpanda63

Makefile

@@ -84,3 +84,13 @@ replace_version:
 	poetry version $(version)
 	sed -i.bak "s/1.0-REPLACE-VERSION/$$version/g" aikido_zen/config.py
 	rm aikido_zen/config.py.bak
+
+
+
+relock_sample_apps:
+	@for f in sample-apps/**/; do \
+  		echo "Entering $$f"; \
+  		cd $$f && poetry lock; \
+  		cd ../../; \
+  	done
+

aikido_zen/__init__.py

@@ -2,10 +2,6 @@
 Aggregates from the different modules
 """
 
-# pylint: disable=import-outside-toplevel
-
-from dotenv import load_dotenv
-
 # Re-export functions :
 from aikido_zen.context.users import set_user
 from aikido_zen.middleware import should_block_request
@@ -20,8 +16,6 @@
 from aikido_zen.config import PKG_VERSION
 from aikido_zen.helpers.aikido_disabled_flag_active import aikido_disabled_flag_active
 
-load_dotenv()
-
 
 def protect(mode="daemon"):
     """

poetry.lock

@@ -56,7 +56,6 @@ homepage = "https://www.aikido.dev/runtime/firewall/"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-python-dotenv = "^1.0.1"
 regex = "^2024.5.15"
 requests = "^2.32.3"
 packaging = "^24.1"