Skip to content

Commit

Permalink
Pinned redis py to 4.3.5 (django#349)
Browse files Browse the repository at this point in the history
* tox tests longer than 10 minutes are likely hung so let github bail
* pin redis 4.3.5
* let the async_timeout occur
* Added change note.

---------

Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>
  • Loading branch information
2 people authored and Shi Feng committed Jun 16, 2023
1 parent 5ea9dba commit a067352
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
tests:
name: Python ${{ matrix.python-version }}
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
UNRELEASED
----------

* Pinned redis-py version to 4.3.5 in order to avoid difficult to diagnose
issues occurring with redis-py 4.4+ (to 4.5.2 currently).


4.0.0 (2022-10-07)
------------------

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
include_package_data=True,
python_requires=">=3.7",
install_requires=[
"redis>=4.2.0",
"redis==4.3.5",
"msgpack~=1.0",
"asgiref>=3.2.10,<4",
"channels",
Expand Down
3 changes: 2 additions & 1 deletion tests/test_pubsub.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ async def channel_layer():
"""
channel_layer = RedisPubSubChannelLayer(hosts=TEST_HOSTS)
yield channel_layer
await channel_layer.flush()
async with async_timeout.timeout(1):
await channel_layer.flush()


@pytest.fixture()
Expand Down
3 changes: 2 additions & 1 deletion tests/test_pubsub_sentinel.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ async def channel_layer():
"""
channel_layer = RedisPubSubChannelLayer(hosts=TEST_HOSTS)
yield channel_layer
await channel_layer.flush()
async with async_timeout.timeout(1):
await channel_layer.flush()


@pytest.mark.asyncio
Expand Down

0 comments on commit a067352

Please sign in to comment.