Merge branch 'main' into fix-linter-ruff

Author: TimPansino

.github/workflows/build-ci-image.yml

@@ -44,7 +44,7 @@ jobs:
 
       - name: Generate Docker Metadata (Tags and Labels)
         id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # 5.7.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # 5.8.0
         with:
           images: ghcr.io/${{ github.repository }}-ci
           flavor: |
@@ -59,7 +59,7 @@ jobs:
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # 3.4.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # 3.5.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/trivy.yml

@@ -61,6 +61,6 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: ${{ github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # 3.29.4
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # 3.29.5
         with:
           sarif_file: "trivy-results.sarif"

newrelic/hooks/datastore_redis.py

@@ -439,10 +439,12 @@
     "wait",
     "waitaof",
     "xack",
+    "xackdel",
     "xadd",
     "xautoclaim",
     "xclaim",
     "xdel",
+    "xdelex",
     "xgroup_create",
     "xgroup_createconsumer",
     "xgroup_del_consumer",

tox.ini

@@ -90,8 +90,6 @@ envlist =
     python-adapter_uvicorn-{py37,py38,py39,py310,py311,py312,py313}-uvicornlatest,
     python-adapter_uvicorn-py38-uvicorn014,
     python-adapter_waitress-{py37,py38,py39,py310,py311,py312,py313}-waitresslatest,
-    python-adapter_waitress-{py37,py38,py39,py310}-waitress02,
-    python-adapter_waitress-{py37,py38,py39}-waitress010404,
     python-agent_features-{py37,py38,py39,py310,py311,py312,py313}-{with,without}_extensions,
     python-agent_features-pypy310-without_extensions,
     python-agent_streaming-{py37,py38,py39,py310,py311,py312,py313}-protobuf06-{with,without}_extensions,
@@ -184,12 +182,14 @@ envlist =
 [testenv]
 deps =
     # Base Dependencies
-    {py38,py39,py310,py311,py312,py313,pypy310}: pytest==8.3.2
+    {py39,py310,py311,py312,py313,pypy310}: pytest==8.4.1
+    py38: pytest==8.3.5
     py37: pytest==7.4.4
     iniconfig
     coverage
-    WebTest==3.0.0
+    {py39,py310,py311,py312,py313,pypy310}: WebTest==3.0.6
     py313: legacy-cgi==2.6.1  # cgi was removed from the stdlib in 3.13, and is required for WebTest
+    {py37,py38}: WebTest==3.0.1
 
     # Test Suite Dependencies
     adapter_asgiref-asgireflatest: asgiref
@@ -220,7 +220,6 @@ deps =
     adapter_uvicorn-uvicornlatest: uvicorn
     adapter_uvicorn: typing-extensions
     adapter_waitress: WSGIProxy2
-    adapter_waitress-waitress02: waitress<2.1
     adapter_waitress-waitresslatest: waitress
     agent_features: beautifulsoup4
     agent_features: protobuf