Merge branch 'master' into fixing_mypy_errors

Author: petyaslavova

.github/actions/run-tests/action.yml

@@ -73,8 +73,8 @@ runs:
 
           # Mapping of redis version to stack version
           declare -A redis_stack_version_mapping=(
-            ["7.4.2"]="rs-7.4.0-v2"
-            ["7.2.7"]="rs-7.2.0-v14"
+            ["7.4.4"]="rs-7.4.0-v5"
+            ["7.2.9"]="rs-7.2.0-v17"
           )
 
           if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
@@ -91,8 +91,10 @@ runs:
           fi
 
           invoke devenv --endpoints=all-stack
+
         else
           echo "Using redis CE for module tests"
+          export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=$REDIS_VERSION
           echo "REDIS_MOD_URL=redis://127.0.0.1:6379" >> $GITHUB_ENV
           invoke devenv --endpoints all
         fi

.github/wordlist.txt

@@ -1,7 +1,9 @@
 APM
 ARGV
 BFCommands
+balancer
 CacheImpl
+cancelling
 CAS
 CFCommands
 CMSCommands
@@ -10,19 +12,32 @@ ClusterNodes
 ClusterPipeline
 ClusterPubSub
 ConnectionPool
+config
 CoreCommands
+DatabaseConfig
+DNS
+EchoHealthCheck
 EVAL
 EVALSHA
+failover
+FQDN
 Grokzen's
+Healthcheck
+HealthCheckPolicies
+healthcheck
+healthchecks
 INCR
 IOError
 Instrumentations
 JSONCommands
 Jaeger
 Ludovico
 Magnocavallo
+MultiDbConfig
+MultiDBClient
 McCurdy
 NOSCRIPT
+NoValidDatabaseException
 NUMPAT
 NUMPT
 NUMSUB
@@ -43,6 +58,7 @@ RedisInstrumentor
 RedisJSON
 RedisTimeSeries
 SHA
+SLA
 SearchCommands
 SentinelCommands
 SentinelConnectionPool
@@ -52,6 +68,8 @@ SpanKind
 Specfiying
 StatusCode
 TCP
+TemporaryUnavailableException
+TLS
 TOPKCommands
 TimeSeriesCommands
 Uptrace
@@ -91,6 +109,7 @@ json
 keyslot
 keyspace
 kwarg
+kwargs
 linters
 localhost
 lua

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docs.yaml

@@ -25,8 +25,8 @@ jobs:
      name: Build docs
      runs-on: ubuntu-latest
      steps:
-       - uses: actions/checkout@v4
-       - uses: actions/setup-python@v5
+       - uses: actions/checkout@v5
+       - uses: actions/setup-python@v6
          with:
            python-version: 3.9
            cache: 'pip'

.github/workflows/hiredis-py-integration.yaml

@@ -23,8 +23,8 @@ env:
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   # this speeds up coverage with Python 3.12: https://github.com/nedbat/coveragepy/issues/1665
   COVERAGE_CORE: sysmon
-  CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: 'rs-7.4.0-v2'
-  CURRENT_REDIS_VERSION: '7.4.2'
+  CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.0.2'
+  CURRENT_REDIS_VERSION: '8.0.2'
 
 jobs:
   redis_version:
@@ -53,7 +53,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}} (${{ matrix.hiredis-version }}); EL:${{matrix.event-loop}}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ inputs.redis-py-branch }}
       - name: Run tests

.github/workflows/install_and_test.sh

@@ -40,9 +40,12 @@ cd ${TESTDIR}
 # install, run tests
 pip install ${PKG}
 # Redis tests
-pytest -m 'not onlycluster'
+pytest -m 'not onlycluster' --ignore=tests/test_scenario --ignore=tests/test_asyncio/test_scenario
 # RedisCluster tests
 CLUSTER_URL="redis://localhost:16379/0"
 CLUSTER_SSL_URL="rediss://localhost:27379/0"
 pytest -m 'not onlynoncluster and not redismod and not ssl' \
-  --redis-url="${CLUSTER_URL}" --redis-ssl-url="${CLUSTER_SSL_URL}"
+  --ignore=tests/test_scenario \
+  --ignore=tests/test_asyncio/test_scenario \
+  --redis-url="${CLUSTER_URL}" \
+  --redis-ssl-url="${CLUSTER_SSL_URL}"

.github/workflows/integration.yaml

@@ -27,15 +27,17 @@ env:
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   # this speeds up coverage with Python 3.12: https://github.com/nedbat/coveragepy/issues/1665
   COVERAGE_CORE: sysmon
-  CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: 'rs-7.4.0-v2'
-  CURRENT_REDIS_VERSION: '7.4.2'
+  # patch releases get included in the base version image when they are published
+  # for example after 8.2.1 is published, 8.2 image contains 8.2.1 content
+  CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.2'
+  CURRENT_REDIS_VERSION: '8.2'
 
 jobs:
   dependency-audit:
     name: Dependency audit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pypa/gh-action-pip-audit@v1.0.8
         with:
           inputs: dev_requirements.txt
@@ -46,8 +48,8 @@ jobs:
     name: Code linters
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.9
           cache: 'pip'
@@ -74,15 +76,15 @@ jobs:
       max-parallel: 15
       fail-fast: false
       matrix:
-        redis-version: ['8.0.1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7']
+        redis-version: ['8.4-M01-pre', '${{ needs.redis_version.outputs.CURRENT }}', '8.0.2' ,'7.4.4', '7.2.9']
         python-version: ['3.9', '3.13']
         parser-backend: ['plain']
         event-loop: ['asyncio']
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -99,14 +101,14 @@ jobs:
       fail-fast: false
       matrix:
         redis-version: [ '${{ needs.redis_version.outputs.CURRENT }}' ]
-        python-version: ['3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
+        python-version: ['3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
         parser-backend: [ 'plain' ]
         event-loop: [ 'asyncio' ]
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -131,7 +133,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}} (${{ matrix.hiredis-version }}); EL:${{matrix.event-loop}}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -156,7 +158,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     name: Redis ${{ matrix.redis-version }}; Python ${{ matrix.python-version }}; RESP Parser:${{matrix.parser-backend}}; EL:${{matrix.event-loop}}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run tests
         uses: ./.github/actions/run-tests
         with:
@@ -174,8 +176,8 @@ jobs:
       matrix:
         extension: ['tar.gz', 'whl']
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Run installed unit tests
@@ -193,8 +195,8 @@ jobs:
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.9', 'pypy-3.10']
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

.github/workflows/pypi-publish.yaml

@@ -13,9 +13,9 @@ jobs:
   build_and_package:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: install python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - run: pip install build twine

.github/workflows/spellcheck.yml

@@ -6,9 +6,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.49.0
+        uses: rojopolis/spellcheck-github-actions@0.52.0
         with:
           config_path: .github/spellcheck-settings.yml
           task_name: Markdown

.github/workflows/stale-issues.yml

@@ -1,25 +1,95 @@
-name: "Close stale issues"
+name: "Stale Issue Management"
 on:
   schedule:
-  - cron: "0 0 * * *"
+    # Run daily at midnight UTC
+    - cron: "0 0 * * *"
+  workflow_dispatch: # Allow manual triggering
+
+env:
+  # Default stale policy timeframes
+  DAYS_BEFORE_STALE: 365
+  DAYS_BEFORE_CLOSE: 30
+
+  # Accelerated timeline for needs-information issues
+  NEEDS_INFO_DAYS_BEFORE_STALE: 30
+  NEEDS_INFO_DAYS_BEFORE_CLOSE: 7
 
-permissions: {}
 jobs:
   stale:
-    permissions:
-      issues: write  #  to close stale issues (actions/stale)
-      pull-requests: write  #  to close stale PRs (actions/stale)
-
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v9
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue is marked stale. It will be closed in 30 days if it is not updated.'
-        stale-pr-message: 'This pull request is marked stale. It will be closed in 30 days if it is not updated.'
-        days-before-stale: 365
-        days-before-close: 30
-        stale-issue-label: "Stale"
-        stale-pr-label: "Stale"
-        operations-per-run: 20
-        remove-stale-when-updated: true
+      # First step: Handle regular issues (excluding needs-information)
+      - name: Mark regular issues as stale
+        uses: actions/stale@v10
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Default stale policy
+          days-before-stale: ${{ env.DAYS_BEFORE_STALE }}
+          days-before-close: ${{ env.DAYS_BEFORE_CLOSE }}
+
+          # Explicit stale label configuration
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+
+          stale-issue-message: |
+            This issue has been automatically marked as stale due to inactivity.
+            It will be closed in 30 days if no further activity occurs.
+            If you believe this issue is still relevant, please add a comment to keep it open.
+
+          close-issue-message: |
+            This issue has been automatically closed due to inactivity.
+            If you believe this issue is still relevant, please reopen it or create a new issue with updated information.
+
+          # Exclude needs-information issues from this step
+          exempt-issue-labels: 'no-stale,needs-information'
+
+          # Remove stale label when issue/PR becomes active again
+          remove-stale-when-updated: true
+
+          # Apply to pull requests with same timeline
+          days-before-pr-stale: ${{ env.DAYS_BEFORE_STALE }}
+          days-before-pr-close: ${{ env.DAYS_BEFORE_CLOSE }}
+
+          stale-pr-message: |
+            This pull request has been automatically marked as stale due to inactivity.
+            It will be closed in 30 days if no further activity occurs.
+
+          close-pr-message: |
+            This pull request has been automatically closed due to inactivity.
+            If you would like to continue this work, please reopen the PR or create a new one.
+
+          # Only exclude no-stale PRs (needs-information PRs follow standard timeline)
+          exempt-pr-labels: 'no-stale'
+
+      # Second step: Handle needs-information issues with accelerated timeline
+      - name: Mark needs-information issues as stale
+        uses: actions/stale@v10
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+          # Accelerated timeline for needs-information
+          days-before-stale: ${{ env.NEEDS_INFO_DAYS_BEFORE_STALE }}
+          days-before-close: ${{ env.NEEDS_INFO_DAYS_BEFORE_CLOSE }}
+
+          # Explicit stale label configuration
+          stale-issue-label: "stale"
+
+          # Only target ISSUES with needs-information label (not PRs)
+          only-issue-labels: 'needs-information'
+
+          stale-issue-message: |
+            This issue has been marked as stale because it requires additional information
+            that has not been provided for 30 days. It will be closed in 7 days if the
+            requested information is not provided.
+
+          close-issue-message: |
+            This issue has been closed because the requested information was not provided within the specified timeframe.
+            If you can provide the missing information, please reopen this issue or create a new one.
+
+          # Disable PR processing for this step
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+
+          # Remove stale label when issue becomes active again
+          remove-stale-when-updated: true