Skip to content

Commit f17b1f9

Browse files
authored
Merge branch 'master' into ps_extract_hitless_related_connection_management_logic_in_mixin_classes
2 parents 7f99734 + f3806fa commit f17b1f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+11689
-26
lines changed

.github/wordlist.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
APM
22
ARGV
33
BFCommands
4+
balancer
45
CacheImpl
6+
cancelling
57
CAS
68
CFCommands
79
CMSCommands
@@ -10,19 +12,32 @@ ClusterNodes
1012
ClusterPipeline
1113
ClusterPubSub
1214
ConnectionPool
15+
config
1316
CoreCommands
17+
DatabaseConfig
18+
DNS
19+
EchoHealthCheck
1420
EVAL
1521
EVALSHA
22+
failover
23+
FQDN
1624
Grokzen's
25+
Healthcheck
26+
HealthCheckPolicies
27+
healthcheck
28+
healthchecks
1729
INCR
1830
IOError
1931
Instrumentations
2032
JSONCommands
2133
Jaeger
2234
Ludovico
2335
Magnocavallo
36+
MultiDbConfig
37+
MultiDBClient
2438
McCurdy
2539
NOSCRIPT
40+
NoValidDatabaseException
2641
NUMPAT
2742
NUMPT
2843
NUMSUB
@@ -43,6 +58,7 @@ RedisInstrumentor
4358
RedisJSON
4459
RedisTimeSeries
4560
SHA
61+
SLA
4662
SearchCommands
4763
SentinelCommands
4864
SentinelConnectionPool
@@ -52,6 +68,8 @@ SpanKind
5268
Specfiying
5369
StatusCode
5470
TCP
71+
TemporaryUnavailableException
72+
TLS
5573
TOPKCommands
5674
TimeSeriesCommands
5775
Uptrace
@@ -91,6 +109,7 @@ json
91109
keyslot
92110
keyspace
93111
kwarg
112+
kwargs
94113
linters
95114
localhost
96115
lua

.github/workflows/install_and_test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ cd ${TESTDIR}
4040
# install, run tests
4141
pip install ${PKG}
4242
# Redis tests
43-
pytest -m 'not onlycluster' --ignore=tests/test_scenario
43+
pytest -m 'not onlycluster' --ignore=tests/test_scenario --ignore=tests/test_asyncio/test_scenario
4444
# RedisCluster tests
4545
CLUSTER_URL="redis://localhost:16379/0"
4646
CLUSTER_SSL_URL="rediss://localhost:27379/0"
4747
pytest -m 'not onlynoncluster and not redismod and not ssl' \
4848
--ignore=tests/test_scenario \
49+
--ignore=tests/test_asyncio/test_scenario \
4950
--redis-url="${CLUSTER_URL}" \
5051
--redis-ssl-url="${CLUSTER_SSL_URL}"

dev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ uvloop
1414
vulture>=2.3.0
1515
numpy>=1.24.0
1616
redis-entraid==1.0.0
17+
pybreaker>=1.4.0

0 commit comments

Comments
 (0)