Skip to content

Commit 213f7af

Browse files
authored
Chore/upgrade dependencies after v0.33 (#2215)
* Upgrade dependencies for v1.0.0 Signed-off-by: Nicolas Höning <nicolas@seita.nl> * patch fake redis class for testing after RQ upgrade - add default addr attribute to client_list() Signed-off-by: Nicolas Höning <nicolas@seita.nl> * changelog entry Signed-off-by: Nicolas Höning <nicolas@seita.nl> * move new class to test utils Signed-off-by: Nicolas Höning <nicolas@seita.nl> * move import (back) into teting block Signed-off-by: Nicolas Höning <nicolas@seita.nl> --------- Signed-off-by: Nicolas Höning <nicolas@seita.nl>
1 parent 7abc015 commit 213f7af

4 files changed

Lines changed: 1244 additions & 1092 deletions

File tree

documentation/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ New features
1414

1515
Infrastructure / Support
1616
----------------------
17+
* Upgraded dependencies [see `PR #2215 <https://www.github.com/FlexMeasures/flexmeasures/pull/2215>`_]
1718

1819
Bugfixes
1920
-----------

flexmeasures/app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ def create( # noqa C901
8989

9090
# configure Redis (for redis queue)
9191
if app.testing:
92-
from fakeredis import FakeStrictRedis
92+
from flexmeasures.tests.utils import RQCompatibleFakeStrictRedis
9393

94-
redis_conn = FakeStrictRedis(
94+
redis_conn = RQCompatibleFakeStrictRedis(
9595
host="redis", port="1234"
9696
) # dummy connection details
9797
else:

flexmeasures/tests/utils.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from __future__ import annotations
22

33
from sqlalchemy import select, event
4+
from fakeredis import FakeStrictRedis
45

56
from flexmeasures.data.models.time_series import Sensor
67

@@ -28,3 +29,15 @@ def __exit__(self, *args, **kwargs):
2829

2930
def callback(self, *args, **kwargs):
3031
self.count += 1
32+
33+
34+
class RQCompatibleFakeStrictRedis(FakeStrictRedis):
35+
"""
36+
A fake Redis client that is compatible with RQ >= 2.9.0.
37+
"""
38+
39+
def client_list(self, *args, **kwargs):
40+
clients = super().client_list(*args, **kwargs)
41+
for client in clients:
42+
client.setdefault("addr", "fakeredis:0")
43+
return clients

0 commit comments

Comments
 (0)