Merge pull request #7 from django-utils/methods

Renamed internal methods in core channel layer.

Author: amirreza8002

.github/workflows/tests.yml

@@ -50,7 +50,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
 
       - name: Install dependencies
         run: | 

.pre-commit-config.yaml

@@ -1,16 +1,13 @@
 repos:
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.24.0
+    rev: 1.25.0
     hooks:
       - id: django-upgrade
-        args: [--target-version, "5.1"]
-  
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-      - id: black
+        args: [--target-version, "5.2"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.5
+    rev: v0.12.4
     hooks:
-      - id: ruff
+      - id: ruff-check
+      - id: ruff-format
+

channels_valkey/core.py

@@ -168,7 +168,7 @@ async def send(self, channel, message):
         """
         # 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
@@ -255,12 +255,12 @@ async def receive(self, channel):
         """
         # 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(
-                self.client_prefix + "!"
-            ), "Wrong client prefix"
+            assert real_channel.endswith(self.client_prefix + "!"), (
+                "Wrong client prefix"
+            )
             # Enter receiving section
             loop = asyncio.get_running_loop()
             self.receive_count += 1
@@ -376,7 +376,9 @@ async def receive_single(self, channel):
         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("!")
@@ -481,8 +483,8 @@ async def group_add(self, group, channel):
         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))
@@ -507,7 +509,7 @@ async def group_send(self, group, message):
         """
         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))

pyproject.toml

@@ -14,8 +14,8 @@ description = "Valkey-backed ASGI channel layer implementation"
 readme = "README.rst"
 requires-python = ">=3.9"
 dependencies = [
-    "asgiref>=3.2.10",
-    "channels>=4.1.0",
+    "asgiref>=3.9.1",
+    "channels>=4.2.2",
     "msgpack>=1.1.0",
     "valkey>=6.0.0",
 ]
@@ -32,13 +32,12 @@ cryptography = [
 
 [tool.uv]
 dev-dependencies = [
-    "async-timeout>=4.0.3",
-    "black>=24.10.0",
+    "async-timeout>=5.0.1",
     "coverage>=7.6.2",
-    "pre-commit>=4.0.1",
-    "pytest>=8.3.3",
+    "pre-commit>=4.2.0",
+    "pytest>=8.4.1",
     "pytest-asyncio>=1.1.0",
-    "ruff>=0.6.9",
+    "ruff>=0.12.4",
     "tox>=4.21.2",
 ]
 

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{39,310,311,312,313}-ch{30,40,main}-valkey60
-    py311-chmain-valkey{60,main}
+    py{39,310,311,312,313}-ch{4,main}-valkey6
+    py313-chmain-valkey{6,main}
     qa
 
 [testenv]
@@ -12,17 +12,15 @@ commands =
     uv run pytest -v {posargs}
 
 deps =
-    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
-    valkey60: valkey>=6.0,<6.1
+    valkey6: valkey>=6.0,<7
     valkeymain: https://github.com/valkey-io/valkey-py/archive/master.tar.gz
 
 [testenv:qa]
 skip_install=true
 deps =
-    black
     ruff
 commands =
     ruff check channels_valkey tests
-    black --check channels_valkey tests
+    ruff format channels_valkey tests