Replace flake8+isort+black with ruff

benchmarks/command_packer_benchmark.py

@@ -78,7 +78,6 @@ def pack_command(self, *args):
 
 
 class CommandPackerBenchmark(Benchmark):
-
     ARGUMENTS = (
         {
             "name": "connection_class",

benchmarks/socket_read_size.py

@@ -4,7 +4,6 @@
 
 
 class SocketReadBenchmark(Benchmark):
-
     ARGUMENTS = (
         {"name": "parser", "values": [PythonParser, _HiredisParser]},
         {

dev_requirements.txt

@@ -1,7 +1,5 @@
 click==8.0.4
-black==22.3.0
-flake8==5.0.4
-flake8-isort==6.0.0
+ruff==0.2.1
 flynt~=0.69.0
 mock==4.0.3
 packaging>=20.4

redis/_parsers/helpers.py

@@ -490,7 +490,7 @@ def parse_geosearch_generic(response, **options):
     except KeyError:  # it means the command was sent via execute_command
         return response
 
-    if type(response) != list:
+    if type(response) != list:  # noqa: E721
         response_list = [response]
     else:
         response_list = response
@@ -826,9 +826,7 @@ def string_keys_to_dict(key_string, callback):
     else bool_ok(r),
     "COMMAND": parse_command_resp3,
     "CONFIG GET": lambda r: {
-        str_if_bytes(key)
-        if key is not None
-        else None: str_if_bytes(value)
+        str_if_bytes(key) if key is not None else None: str_if_bytes(value)
         if value is not None
         else None
         for key, value in r.items()

redis/asyncio/cluster.py

@@ -402,10 +402,10 @@ def __init__(
         self.command_flags = self.__class__.COMMAND_FLAGS.copy()
         self.response_callbacks = kwargs["response_callbacks"]
         self.result_callbacks = self.__class__.RESULT_CALLBACKS.copy()
-        self.result_callbacks[
-            "CLUSTER SLOTS"
-        ] = lambda cmd, res, **kwargs: parse_cluster_slots(
-            list(res.values())[0], **kwargs
+        self.result_callbacks["CLUSTER SLOTS"] = (
+            lambda cmd, res, **kwargs: parse_cluster_slots(
+                list(res.values())[0], **kwargs
+            )
         )
 
         self._initialize = True

redis/commands/graph/__init__.py

@@ -252,7 +252,7 @@ async def call_procedure(self, procedure, *args, read_only=False, **kwagrs):
         return await self.query(q, read_only=read_only)
 
     async def labels(self):
-        return ((await self.call_procedure(DB_LABELS, read_only=True))).result_set
+        return (await self.call_procedure(DB_LABELS, read_only=True)).result_set
 
     async def property_keys(self):
         return (await self.call_procedure(DB_PROPERTYKEYS, read_only=True)).result_set

redis/commands/graph/commands.py

@@ -171,9 +171,7 @@ def config(self, name, value=None, set=False):
             if set:
                 params.append(value)
             else:
-                raise DataError(
-                    "``value`` can be provided only when ``set`` is True"
-                )  # noqa
+                raise DataError("``value`` can be provided only when ``set`` is True")  # noqa
         return self.execute_command(CONFIG_CMD, *params)
 
     def list_keys(self):

redis/commands/timeseries/info.py

@@ -78,7 +78,7 @@ def __init__(self, args):
             self.chunk_size = response["chunkSize"]
         if "duplicatePolicy" in response:
             self.duplicate_policy = response["duplicatePolicy"]
-            if type(self.duplicate_policy) == bytes:
+            if type(self.duplicate_policy) == bytes:  # noqa: E721
                 self.duplicate_policy = self.duplicate_policy.decode()
 
     def get(self, item):

redis/exceptions.py

@@ -79,6 +79,7 @@ class ModuleError(ResponseError):
 
 class LockError(RedisError, ValueError):
     "Errors acquiring or releasing a lock"
+
     # NOTE: For backwards compatibility, this class derives from ValueError.
     # This was originally chosen to behave like threading.Lock.
 
@@ -89,11 +90,13 @@ def __init__(self, message, lock_name=None):
 
 class LockNotOwnedError(LockError):
     "Error trying to extend or release a lock that is (no longer) owned"
+
     pass
 
 
 class ChildDeadlockedError(Exception):
     "Error indicating that a child process is deadlocked after a fork()"
+
     pass
 
 

redis/ocsp.py

@@ -15,6 +15,7 @@
 from cryptography.hazmat.primitives.hashes import SHA1, Hash
 from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
 from cryptography.x509 import ocsp
+
 from redis.exceptions import AuthorizationError, ConnectionError
 
 

ruff.toml

@@ -0,0 +1,37 @@
+line-length = 88
+exclude = [
+    "*.egg-info",
+    "*.pyc",
+    ".git",
+    ".venv*",
+    ".venv*",
+    "build",
+    "dist",
+    "docker",
+    "docs/*",
+    "tasks.py",
+    "venv*",
+    "whitelist.py",
+]
+[lint]
+ignore = [
+    "E501",
+    "E741",
+    "F405",
+    "N801",
+    "N802",
+    "N803",
+    "N806",
+    "N815",
+    "N818",
+]
+extend-select = [
+    "E",
+    "F",
+    "N",
+    "W",
+    "I",
+]
+[lint.per-file-ignores]
+"redis/commands/search/indexDefinition.py" = ["N999"]
+"tests/*" = ["I"]

setup.py

@@ -37,7 +37,7 @@
     python_requires=">=3.8",
     install_requires=[
         'typing-extensions; python_version<"3.8"',
-        'async-timeout>=4.0.3',
+        "async-timeout>=4.0.3",
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

tasks.py

@@ -27,8 +27,8 @@ def build_docs(c):
 @task
 def linters(c):
     """Run code linters"""
-    run("flake8 tests redis")
-    run("black --target-version py37 --check --diff tests redis")
+    run("ruff tests redis")
+    run("ruff format --check --diff tests redis")
     run("isort --check-only --diff tests redis")
     run("vulture redis whitelist.py --min-confidence 80")
     run("flynt --fail-on-change --dry-run tests redis")

tests/test_commands.py

@@ -3173,8 +3173,9 @@ def test_hmget(self, r):
     def test_hmset(self, r):
         redis_class = type(r).__name__
         warning_message = (
-            r"^{0}\.hmset\(\) is deprecated\. "
-            r"Use {0}\.hset\(\) instead\.$".format(redis_class)
+            r"^{0}\.hmset\(\) is deprecated\. " r"Use {0}\.hset\(\) instead\.$".format(
+                redis_class
+            )
         )
         h = {b"a": b"1", b"b": b"2", b"c": b"3"}
         with pytest.warns(DeprecationWarning, match=warning_message):