Skip to content

Commit d3be1a1

Browse files
committed
Removes valkey cluster references
1 parent e9a6ad1 commit d3be1a1

File tree

2 files changed

+9
-30
lines changed

2 files changed

+9
-30
lines changed

tests/testing_support/db_settings.py

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ def redis_cluster_settings():
147147
]
148148
return settings
149149

150+
150151
def valkey_settings():
151152
"""Return a list of dict of settings for connecting to valkey.
152153
@@ -170,31 +171,6 @@ def valkey_settings():
170171
return settings
171172

172173

173-
def valkey_cluster_settings():
174-
"""Return a list of dict of settings for connecting to valkey cluster.
175-
176-
Will return the correct settings, depending on which of the environments it
177-
is running in. It attempts to set variables in the following order, where
178-
later environments override earlier ones.
179-
180-
1. Local
181-
2. Github Actions
182-
"""
183-
184-
host = "host.docker.internal" if "GITHUB_ACTIONS" in os.environ else "localhost"
185-
instances = 1
186-
base_port = 6379
187-
188-
settings = [
189-
{
190-
"host": host,
191-
"port": base_port + instance_num,
192-
}
193-
for instance_num in range(instances)
194-
]
195-
return settings
196-
197-
198174
def memcached_settings():
199175
"""Return a list of dict of settings for connecting to memcached.
200176
@@ -233,7 +209,11 @@ def mongodb_settings():
233209
host = "host.docker.internal" if "GITHUB_ACTIONS" in os.environ else "127.0.0.1"
234210
instances = 2
235211
settings = [
236-
{"host": host, "port": 8080 + instance_num, "collection": f"mongodb_collection_{str(os.getpid())}"}
212+
{
213+
"host": host,
214+
"port": 8080 + instance_num,
215+
"collection": f"mongodb_collection_{str(os.getpid())}",
216+
}
237217
for instance_num in range(instances)
238218
]
239219
return settings
@@ -254,7 +234,9 @@ def firestore_settings():
254234

255235
host = "host.docker.internal" if "GITHUB_ACTIONS" in os.environ else "127.0.0.1"
256236
instances = 2
257-
settings = [{"host": host, "port": 8080 + instance_num} for instance_num in range(instances)]
237+
settings = [
238+
{"host": host, "port": 8080 + instance_num} for instance_num in range(instances)
239+
]
258240
return settings
259241

260242

tox.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ envlist =
177177
redis-datastore_redis-{py37,py38,py39,py310,py311,py312,py313,pypy310}-redislatest,
178178
rediscluster-datastore_rediscluster-{py37,py312,py313,pypy310}-redislatest,
179179
valkey-datastore_valkey-{py38,py39,py310,py311,py312,py313,pypy310}-valkeylatest,
180-
valkeycluster-datastore_valkeycluster-{py38,py313,pypy310}-valkeylatest,
181180
solr-datastore_pysolr-{py37,py38,py39,py310,py311,py312,py313,pypy310},
182181

183182
[testenv]
@@ -288,7 +287,6 @@ deps =
288287
datastore_redis-redislatest: redis
289288
datastore_rediscluster-redislatest: redis
290289
datastore_valkey-valkeylatest: valkey
291-
datastore_valkeycluster-valkeylatest: valkey
292290
external_aiobotocore-aiobotocorelatest: aiobotocore[awscli]
293291
external_aiobotocore-aiobotocorelatest: flask
294292
external_aiobotocore-aiobotocorelatest: flask-cors
@@ -492,7 +490,6 @@ changedir =
492490
datastore_redis: tests/datastore_redis
493491
datastore_rediscluster: tests/datastore_rediscluster
494492
datastore_valkey: tests/datastore_valkey
495-
datastore_valkeycluster: tests/datastore_valkeycluster
496493
datastore_sqlite: tests/datastore_sqlite
497494
external_aiobotocore: tests/external_aiobotocore
498495
external_botocore: tests/external_botocore

0 commit comments

Comments
 (0)