Merge branch 'main' into feat/type_hint

Author: iwakitakuma33

.github/workflows/tests.yml

@@ -15,7 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"

CHANGELOG.txt

@@ -1,3 +1,23 @@
+4.3.0 (2025-07-22)
+------------------
+
+* Added support for Python 3.13.
+
+* Dropped support for EOL Python 3.8.
+
+* Updated Channels dependency to at least v4.2.2.
+
+* Updated asgiref dependency to at least v3.9.1.
+
+* Fixed compatibility with latest versions of pytest-asyncio.
+
+* Renamed internal methods in core channel layer for compatibility with
+  Channels v4.2.1+
+
+* Dropped testing against legacy Channels v3 branch.
+
+* Updated testing against latest redis-py versions.
+
 4.2.1 (2024-11-15)
 ------------------
 

README.rst

@@ -19,9 +19,11 @@ There are two available implementations:
 
 Both layers support a single-server and sharded configurations.
 
-`channels_redis` is tested against Python 3.8 to 3.13, `redis-py` versions 4.6,
-5.0, and the development branch, and Channels versions 3, 4 and the development
-branch there.
+`channels_redis` is tested against Python 3.9 to 3.13. We test with the latest
+`redis-py` version, as well as the older 5.x branch and main development branch,
+using the latest stable Python and Channels versions. We test the Channels
+development branch, using the latest stable Python and the latest `redis-py`
+release.
 
 Installation
 ------------

channels_redis/__init__.py

@@ -1 +1 @@
-__version__ = "4.2.1"
+__version__ = "4.3.0"

channels_redis/core.py

@@ -177,7 +177,7 @@ async def send(self, channel: str, message: typing.Any) -> None:
         """
         # Typecheck
         assert isinstance(message, dict), "message is not a dict"
-        assert self.valid_channel_name(channel), "Channel name not valid"
+        assert self.require_valid_channel_name(channel), "Channel name not valid"
         # Make sure the message does not contain reserved keys
         assert "__asgi_channel__" not in message
         # If it's a process-local channel, strip off local part and stick full name in message
@@ -266,7 +266,7 @@ async def receive(self, channel: str) -> typing.Any:
         """
         # Make sure the channel name is valid then get the non-local part
         # and thus its index
-        assert self.valid_channel_name(channel)
+        assert self.require_valid_channel_name(channel)
         if "!" in channel:
             real_channel = self.non_local_name(channel)
             assert real_channel.endswith(
@@ -389,7 +389,9 @@ async def receive_single(
         Receives a single message off of the channel and returns it.
         """
         # Check channel name
-        assert self.valid_channel_name(channel, receive=True), "Channel name invalid"
+        assert self.require_valid_channel_name(
+            channel, receive=True
+        ), "Channel name invalid"
         # Work out the connection to use
         if "!" in channel:
             assert channel.endswith("!")
@@ -494,8 +496,8 @@ async def group_add(self, group: str, channel: str) -> None:
         Adds the channel name to a group.
         """
         # Check the inputs
-        assert self.valid_group_name(group), "Group name not valid"
-        assert self.valid_channel_name(channel), "Channel name not valid"
+        assert self.require_valid_group_name(group), "Group name not valid"
+        assert self.require_valid_channel_name(channel), "Channel name not valid"
         # Get a connection to the right shard
         group_key = self._group_key(group)
         connection = self.connection(self.consistent_hash(group))
@@ -510,8 +512,8 @@ async def group_discard(self, group: str, channel: str) -> None:
         Removes the channel from the named group if it is in the group;
         does nothing otherwise (does not error)
         """
-        assert self.valid_group_name(group), "Group name not valid"
-        assert self.valid_channel_name(channel), "Channel name not valid"
+        assert self.require_valid_group_name(group), "Group name not valid"
+        assert self.require_valid_channel_name(channel), "Channel name not valid"
         key = self._group_key(group)
         connection = self.connection(self.consistent_hash(group))
         await connection.zrem(key, channel)
@@ -520,7 +522,7 @@ async def group_send(self, group: str, message: typing.Any) -> None:
         """
         Sends a message to the entire group.
         """
-        assert self.valid_group_name(group), "Group name not valid"
+        assert self.require_valid_group_name(group), "Group name not valid"
         # Retrieve list of all channel names
         key = self._group_key(group)
         connection = self.connection(self.consistent_hash(group))

setup.py

@@ -29,12 +29,12 @@
     zip_safe=False,
     packages=find_packages(exclude=["tests"]),
     include_package_data=True,
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     install_requires=[
         "redis>=4.6",
         "msgpack~=1.0",
-        "asgiref>=3.2.10,<4",
-        "channels",
+        "asgiref>=3.9.1,<4",
+        "channels>=4.2.2",
     ],
     extras_require={"cryptography": crypto_requires, "tests": test_requires},
 )

tests/test_pubsub.py

@@ -61,7 +61,8 @@ async def test_send_receive(channel_layer):
     assert message["text"] == "Ahoy-hoy!"
 
 
-def test_send_receive_sync(channel_layer, event_loop):
+def test_send_receive_sync(channel_layer):
+    event_loop = asyncio.new_event_loop()
     _await = event_loop.run_until_complete
     channel = _await(channel_layer.new_channel())
     async_to_sync(channel_layer.send, force_new_loop=True)(
@@ -70,6 +71,7 @@ def test_send_receive_sync(channel_layer, event_loop):
     message = _await(channel_layer.receive(channel))
     assert message["type"] == "test.message"
     assert message["text"] == "Ahoy-hoy!"
+    event_loop.close()
 
 
 @pytest.mark.asyncio
@@ -86,7 +88,8 @@ async def test_multi_send_receive(channel_layer):
     assert (await channel_layer.receive(channel))["type"] == "message.3"
 
 
-def test_multi_send_receive_sync(channel_layer, event_loop):
+def test_multi_send_receive_sync(channel_layer):
+    event_loop = asyncio.new_event_loop()
     _await = event_loop.run_until_complete
     channel = _await(channel_layer.new_channel())
     send = async_to_sync(channel_layer.send)
@@ -96,6 +99,7 @@ def test_multi_send_receive_sync(channel_layer, event_loop):
     assert _await(channel_layer.receive(channel))["type"] == "message.1"
     assert _await(channel_layer.receive(channel))["type"] == "message.2"
     assert _await(channel_layer.receive(channel))["type"] == "message.3"
+    event_loop.close()
 
 
 @pytest.mark.asyncio

tests/test_pubsub_sentinel.py

@@ -42,7 +42,8 @@ async def test_send_receive(channel_layer):
     assert message["text"] == "Ahoy-hoy!"
 
 
-def test_send_receive_sync(channel_layer, event_loop):
+def test_send_receive_sync(channel_layer):
+    event_loop = asyncio.new_event_loop()
     _await = event_loop.run_until_complete
     channel = _await(channel_layer.new_channel())
     async_to_sync(channel_layer.send, force_new_loop=True)(
@@ -51,6 +52,7 @@ def test_send_receive_sync(channel_layer, event_loop):
     message = _await(channel_layer.receive(channel))
     assert message["type"] == "test.message"
     assert message["text"] == "Ahoy-hoy!"
+    event_loop.close()
 
 
 @pytest.mark.asyncio
@@ -67,7 +69,8 @@ async def test_multi_send_receive(channel_layer):
     assert (await channel_layer.receive(channel))["type"] == "message.3"
 
 
-def test_multi_send_receive_sync(channel_layer, event_loop):
+def test_multi_send_receive_sync(channel_layer):
+    event_loop = asyncio.new_event_loop()
     _await = event_loop.run_until_complete
     channel = _await(channel_layer.new_channel())
     send = async_to_sync(channel_layer.send)
@@ -77,6 +80,7 @@ def test_multi_send_receive_sync(channel_layer, event_loop):
     assert _await(channel_layer.receive(channel))["type"] == "message.1"
     assert _await(channel_layer.receive(channel))["type"] == "message.2"
     assert _await(channel_layer.receive(channel))["type"] == "message.3"
+    event_loop.close()
 
 
 @pytest.mark.asyncio

tox.ini

@@ -1,7 +1,8 @@
 [tox]
 envlist =
-    py{38,39,310,311,312,313}-ch{30,40,main}-redis50
-    py311-chmain-redis{45,46,50,main}
+    py{39,310,311,312,313}-ch4-redis6
+    py313-chmain-redis6
+    py313-ch4-redis{5,main}
     qa
 
 [testenv]
@@ -11,12 +12,10 @@ commands =
     pytest -v {posargs}
     mypy --config-file=tox.ini channels_redis
 deps =
-    mypy>=1.9.0
-    ch30: channels>=3.0,<3.1
-    ch40: channels>=4.0,<4.1
+    ch4: channels>=4.0,<5
     chmain: https://github.com/django/channels/archive/main.tar.gz
-    redis46: redis>=4.6,<4.7
-    redis50: redis>=5.0,<5.1
+    redis5: redis>=5.0,<6
+    redis6: redis>=6.0,<7
     redismain: https://github.com/redis/redis-py/archive/master.tar.gz
 
 [testenv:qa]