Replace flake8 + isort + flynt with ruff

Author: akx

.isort.cfg

@@ -1,9 +1,6 @@
 build
 black==24.3.0
 click==8.0.4
-flake8-isort
-flake8
-flynt~=0.69.0
 invoke==2.2.0
 mock
 packaging>=20.4
@@ -12,6 +9,7 @@ pytest-asyncio>=0.23.0,<0.24.0
 pytest-cov
 pytest-profiling==1.8.1
 pytest-timeout
+ruff==0.9.6
 ujson>=4.2.0
 uvloop
 vulture>=2.3.0

dev_requirements.txt

@@ -21,8 +21,8 @@ pip uninstall -y redis  # uninstall Redis package installed via redis-entraid
 pip install -r doctests/requirements.txt
 ```
 
-Note - the CI process, runs the basic ```black``` and ```isort``` linters against the examples. Assuming
-the requirements above have been installed you can run ```black yourfile.py``` and ```isort yourfile.py```
+Note - the CI process, runs linters against the examples. Assuming
+the requirements above have been installed you can run ```ruff check yourfile.py``` and ```ruff format yourfile.py```
 locally to validate the linting, prior to CI.
 
 Just include necessary assertions in the example file and run

doctests/README.md

@@ -96,3 +96,54 @@ filterwarnings = [
     # Ignore a coverage warning when COVERAGE_CORE=sysmon for Pythons < 3.12.
     "ignore:sys.monitoring isn't available:coverage.exceptions.CoverageWarning",
 ]
+
+[tool.ruff]
+target-version = "py38"
+line-length = 88
+exclude = [
+    "*.egg-info",
+    "*.pyc",
+    ".git",
+    ".venv*",
+    ".venv*",
+    "build",
+    "dist",
+    "docker",
+    "docs/*",
+    "doctests/*",
+    "tasks.py",
+    "venv*",
+    "whitelist.py",
+]
+
+[tool.ruff.lint]
+ignore = [
+    "E501",  # line too long (taken care of with ruff format)
+    "E741",  # ambiguous variable name
+    "N818",  # Errors should have Error suffix
+]
+
+select = [
+    "E",
+    "F",
+    "FLY",
+    "I",
+    "N",
+    "W",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"redis/commands/bf/*" = [
+    # the `bf` module uses star imports, so this is required there.
+    "F405",  # name may be undefined, or defined from star imports
+]
+"redis/commands/{bf,timeseries,json,search}/*" = [
+    "N",
+]
+"tests/*" = [
+    "I",  # TODO: could be enabled, plenty of changes
+    "N801",  # class name should use CapWords convention
+    "N803",  # argument name should be lowercase
+    "N802",  # function name should be lowercase
+    "N806",  # variable name should be lowercase
+]

pyproject.toml

@@ -842,7 +842,7 @@ def __init__(
         if cert_reqs is None:
             self.cert_reqs = ssl.CERT_NONE
         elif isinstance(cert_reqs, str):
-            CERT_REQS = {
+            CERT_REQS = {  # noqa: N806
                 "none": ssl.CERT_NONE,
                 "optional": ssl.CERT_OPTIONAL,
                 "required": ssl.CERT_REQUIRED,

redis/asyncio/connection.py

@@ -16,7 +16,7 @@ def from_url(url, **kwargs):
     return Redis.from_url(url, **kwargs)
 
 
-class pipeline:
+class pipeline:  # noqa: N801
     def __init__(self, redis_obj: "Redis"):
         self.p: "Pipeline" = redis_obj.pipeline()
 

redis/asyncio/utils.py

@@ -1040,7 +1040,7 @@ def __init__(
         if ssl_cert_reqs is None:
             ssl_cert_reqs = ssl.CERT_NONE
         elif isinstance(ssl_cert_reqs, str):
-            CERT_REQS = {
+            CERT_REQS = {  # noqa: N806
                 "none": ssl.CERT_NONE,
                 "optional": ssl.CERT_OPTIONAL,
                 "required": ssl.CERT_REQUIRED,

redis/connection.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
 
 

redis/ocsp.py

@@ -27,11 +27,9 @@ def build_docs(c):
 @task
 def linters(c):
     """Run code linters"""
-    run("flake8 tests redis")
+    run("ruff check tests redis")
     run("black --target-version py37 --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")
 
 
 @task