update CI

Author: amirreza8002

.github/workflows/ci.yml

@@ -13,30 +13,40 @@ jobs:
           - '3.10'
           - '3.11'
           - '3.12'
+          - '3.13'
         django-version:
           - '4.2'
           - '5.0'
           - '5.1'
         valkey-version:
           - 'latest'
-
-        # Only test pre-release dependencies for the latest Python.
-        include:
-          # latest Django with pre-release valkey
-          - django-version: '5.0'
-            valkey-version: 'master'
-            python-version: '3.11'
-
-          # latest valkey with pre-release Django
-          - django-version: 'main'
-            valkey-version: 'latest'
-            python-version: '3.12'
-
-          # pre-release Django and valkey
-          - django-version: 'main'
-            valkey-version: 'master'
-            python-version: '3.11'
-
+          - '7.2'
+
+    services:
+      valkey:
+        image: valkey/valkey:${{ matrix.valkey-version }}
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "valkey-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          VALKEY_EXTRA_FLAGS: '--save ""'
+
+      sentinel:
+        image: bitnami/valkey-sentinel:${{ matrix.valkey-version }}
+        ports:
+          - 26379:26379
+        options: >-
+          --health-cmd "valkey-cli -p 26379 ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          VALKEY_SENTINEL_QUORUM: "1"
+          VALKEY_SENTINEL_AOF_ENABLED: "no"
     steps:
       - uses: actions/checkout@v4
 
@@ -65,7 +75,9 @@ jobs:
           poetry config virtualenvs.in-project true --local
 
       - name: Install project
-        run: poetry install --no-interaction --all-extras
+        run: |
+          poetry add django==${{ matrix.django-version }}
+          poetry install --no-interaction --all-extras
 
       - name: tests
         run: |

tests/settings/sqlite_async_sentinel.py

@@ -9,7 +9,7 @@
 CACHES = {
     "default": {
         "BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
-        "LOCATION": ["valkey://default_service?db=1"],
+        "LOCATION": ["valkey://mymaster?db=1"],
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",
             "SENTINELS": SENTINELS,
@@ -25,15 +25,15 @@
     },
     "sample": {
         "BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.async_cache.client.AsyncSentinelClient",
             "SENTINELS": SENTINELS,
         },
     },
     "with_prefix": {
         "BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "KEY_PREFIX": "test-prefix",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",

tests/settings/sqlite_async_sentinel_opts.py

@@ -7,7 +7,7 @@
 CACHES = {
     "default": {
         "BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
-        "LOCATION": ["valkey://default_service?db=5"],
+        "LOCATION": ["valkey://mymaster?db=5"],
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",
             "SENTINELS": SENTINELS,
@@ -25,7 +25,7 @@
     },
     "sample": {
         "BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.async_cache.client.AsyncSentinelClient",
             "SENTINELS": SENTINELS,
@@ -34,7 +34,7 @@
     },
     "with_prefix": {
         "BACKEND": "django_valkey.async_cache.cache.AsyncValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "KEY_PREFIX": "test-prefix",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.async_cache.client.AsyncDefaultClient",

tests/settings/sqlite_sentinel.py

@@ -7,7 +7,7 @@
 CACHES = {
     "default": {
         "BACKEND": "django_valkey.cache.ValkeyCache",
-        "LOCATION": ["valkey://default_service?db=1"],
+        "LOCATION": ["valkey://mymaster?db=1"],
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.client.DefaultClient",
             "SENTINELS": SENTINELS,
@@ -23,15 +23,15 @@
     },
     "sample": {
         "BACKEND": "django_valkey.cache.ValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.client.SentinelClient",
             "SENTINELS": SENTINELS,
         },
     },
     "with_prefix": {
         "BACKEND": "django_valkey.cache.ValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "KEY_PREFIX": "test-prefix",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.client.DefaultClient",

tests/settings/sqlite_sentinel_opts.py

@@ -7,7 +7,7 @@
 CACHES = {
     "default": {
         "BACKEND": "django_valkey.cache.ValkeyCache",
-        "LOCATION": ["valkey://default_service?db=5"],
+        "LOCATION": ["valkey://mymaster?db=5"],
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.client.DefaultClient",
             "SENTINELS": SENTINELS,
@@ -25,7 +25,7 @@
     },
     "sample": {
         "BACKEND": "django_valkey.cache.ValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.client.SentinelClient",
             "SENTINELS": SENTINELS,
@@ -34,7 +34,7 @@
     },
     "with_prefix": {
         "BACKEND": "django_valkey.cache.ValkeyCache",
-        "LOCATION": "valkey://default_service?db=1",
+        "LOCATION": "valkey://mymaster?db=1",
         "KEY_PREFIX": "test-prefix",
         "OPTIONS": {
             "CLIENT_CLASS": "django_valkey.client.DefaultClient",