soft reset to avoid rebasing conflicts

Author: bitterpanda63

.github/workflows/benchmark.yml

@@ -1,7 +1,8 @@
-name: Benchmark
+name: 📊 Benchmarks
 on:
   push: {}
   workflow_call: {}
+
 jobs:
   benchmark_sql_algorithm:
     runs-on: ubuntu-latest
@@ -13,7 +14,7 @@ jobs:
         working-directory:  ./sample-apps/databases
         run: docker compose up --build -d
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 
@@ -30,15 +31,24 @@ jobs:
         run: |
           poetry run python ./benchmarks/sql_benchmark/sql_benchmark_fw.py
           poetry run python ./benchmarks/sql_benchmark/sql_benchmark_no_fw.py
+
   benchmark_with_flask_mysql:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Start databases
         working-directory:  ./sample-apps/databases
         run: docker compose up --build -d
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Install dependencies & build
         run: |
           python -m pip install --upgrade pip
@@ -51,15 +61,24 @@ jobs:
       - name: Run flask-mysql k6 Benchmark
         run: |
           k6 run -q ./benchmarks/flask-mysql-benchmarks.js
+
   benchmark_with_starlette_app:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Start databases
         working-directory:  ./sample-apps/databases
         run: docker compose up --build -d
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Install dependencies & build
         run: |
           python -m pip install --upgrade pip
@@ -71,9 +90,5 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y wrk
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
       - name: Run benchmark
         run: python ./benchmarks/starlette_benchmark.py

.github/workflows/end2end.yml

@@ -35,7 +35,7 @@ jobs:
           - { name: flask-postgres-xml, testfile: end2end/flask_postgres_xml_lxml_test.py }
           - { name: quart-postgres-uvicorn, testfile: end2end/quart_postgres_uvicorn_test.py }
           - { name: starlette-postgres-uvicorn, testfile: end2end/starlette_postgres_uvicorn_test.py }
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Install packages
         run: sudo apt update && sudo apt install python3-dev libmysqlclient-dev
@@ -53,7 +53,7 @@ jobs:
             docker run --name mock_core -d -p 5000:5000 mock_core
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
 

.github/workflows/smoke-test-ffi.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.12
 

.github/workflows/unit-test.yml

@@ -10,7 +10,7 @@ jobs:
       # Don't cancel jobs if one fails
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -22,7 +22,7 @@ jobs:
       run: |
           sudo echo "127.0.0.1 local.aikido.io" | sudo tee -a /etc/hosts
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

aikido_zen/__init__.py

@@ -50,9 +50,6 @@ def protect(mode="daemon"):
     import aikido_zen.sources.xml_sources.xml
     import aikido_zen.sources.xml_sources.lxml
 
-    import aikido_zen.sources.gunicorn
-    import aikido_zen.sources.uwsgi
-
     # Import DB Sinks
     import aikido_zen.sinks.pymysql
     import aikido_zen.sinks.mysqlclient

aikido_zen/background_process/packages.py

@@ -39,7 +39,7 @@ def is_package_compatible(package=None, required_version=ANY_VERSION, packages=N
                 return True
 
         # No match found
-        logger.info("Zen does not support %s", packages)
+        logger.info("Zen does not support current version of %s", "/".join(packages))
         return False
     except Exception as e:
         logger.debug("Exception occurred in is_package_compatible: %s", e)