add back service to actions workflow for the notebook test

Author: tylerhutcherson

.github/workflows/test.yml

@@ -18,21 +18,21 @@ env:
 
 jobs:
   test:
-    name: Python ${{ matrix.python-version }} - ${{ matrix.connection }} [redis-stack ${{matrix.redis-stack-version}}]
+    name: Python ${{ matrix.python-version }} - ${{ matrix.connection }} [redis ${{matrix.redis-version}}]
     runs-on: ubuntu-latest
 
+    services:
+      redis:
+        image: redis/redis-stack-server:${{matrix.redis-version}}
+        ports:
+          - 6379:6379
+
     strategy:
       fail-fast: false
       matrix:
         python-version: [3.9, '3.10', 3.11, 3.12, 3.13]
         connection: ['hiredis', 'plain']
-        redis-stack-version: ['6.2.6-v9', 'latest', 'edge', '8.0-M03']
-
-    # services:
-    #   redis:
-    #     image: ${{ env.REDIS_IMAGE }}
-    #     ports:
-    #       - 6379:6379
+        redis-version: ['6.2.6-v9', 'latest', '8.0-M03']
 
     steps:
       - name: Check out repository
@@ -60,10 +60,10 @@ jobs:
 
       - name: Set Redis image name
         run: |
-          if [[ "${{ matrix.redis-stack-version }}" == "8.0-M03" ]]; then
-            echo "REDIS_IMAGE=redis:${{ matrix.redis-stack-version }}" >> $GITHUB_ENV
+          if [[ "${{ matrix.redis-version }}" == "8.0-M03" ]]; then
+            echo "REDIS_IMAGE=redis:${{ matrix.redis-version }}" >> $GITHUB_ENV
           else
-            echo "REDIS_IMAGE=redis/redis-stack-server:${{ matrix.redis-stack-version }}" >> $GITHUB_ENV
+            echo "REDIS_IMAGE=redis/redis-stack-server:${{ matrix.redis-version }}" >> $GITHUB_ENV
           fi
 
       - name: Authenticate to Google Cloud
@@ -72,7 +72,7 @@ jobs:
           credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
 
       - name: Run tests
-        if: matrix.connection == 'plain' && matrix.redis-stack-version == 'latest'
+        if: matrix.connection == 'plain' && matrix.redis-version == 'latest'
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }}
           GCP_LOCATION: ${{ secrets.GCP_LOCATION }}
@@ -90,12 +90,12 @@ jobs:
           make test-all
 
       - name: Run tests
-        if: matrix.connection != 'plain' || matrix.redis-stack-version != 'latest'
+        if: matrix.connection != 'plain' || matrix.redis-version != 'latest'
         run: |
           make test
 
       - name: Run notebooks
-        if: matrix.connection == 'plain' && matrix.redis-stack-version == 'latest'
+        if: matrix.connection == 'plain' && matrix.redis-version == 'latest'
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }}
           GCP_LOCATION: ${{ secrets.GCP_LOCATION }}

tests/conftest.py

@@ -25,9 +25,7 @@ def redis_container(request):
 
     # Set the Compose project name so containers do not clash across workers
     os.environ["COMPOSE_PROJECT_NAME"] = f"redis_test_{worker_id}"
-    os.environ.setdefault(
-        "REDIS_IMAGE", "redis:8.0-M03"
-    )  # "redis/redis-stack-server:edge")
+    os.environ.setdefault("REDIS_IMAGE", "redis/redis-stack-server:latest")
 
     compose = DockerCompose(
         context="tests",