Upgrade linting dependencies & switch to ruff (#64)

Author: clokep

.github/workflows/main.yml

@@ -21,19 +21,13 @@ jobs:
           python-version: "3.10"
 
       - name: "Install dependencies"
-        run: python -m pip install pyupgrade==2.31.1 flake8==4.0.1 black==22.3.0 isort==5.10.1 mypy==1.10.1
+        run: python -m pip install ruff==0.11.9 mypy==1.15.0
 
-      - name: "Run pyupgrade"
-        run: pyupgrade --py38-plus **/*.py
+      - name: "Run ruff"
+        run: ruff check
 
-      - name: "Run flake8"
-        run: flake8
-
-      - name: "Run isort"
-        run: isort --check .
-
-      - name: "Run black"
-        run: black --check .
+      - name: "Run ruff format"
+        run: ruff format
 
       - name: "Run mypy"
         run: mypy

CHANGELOG.rst

@@ -21,6 +21,7 @@ Bugfixes
 Maintenance
 -----------
 
+* Update linters and switch to ruff. (`#64 <https://github.com/clokep/django-render-block/pull/64>`_)
 * Support Python 3.13. (`#62 <https://github.com/clokep/django-render-block/pull/62>`_)
 * Drop support for Python 3.8. (`#62 <https://github.com/clokep/django-render-block/pull/62>`_)
 * Support Django 5.2. (`#62 <https://github.com/clokep/django-render-block/pull/62>`_)

manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

pyproject.toml

@@ -2,6 +2,33 @@
 requires = ["setuptools>=38.6.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[tool.ruff.lint]
+select = [
+    # pycodestyle
+    "E",
+    "W",
+    # pyflakes
+    "F",
+    # flake8-bugbear
+    "B0",
+    # flake8-comprehensions
+    "C4",
+    # flake8-2020
+    "YTT",
+    # flake8-slots
+    "SLOT",
+    # flake8-debugger
+    "T10",
+    # flake8-pie
+    "PIE",
+    # flake8-executable
+    "EXE",
+    # isort
+    "I",
+    # pyupgrade
+    "UP",
+]
+
 [tool.mypy]
 warn_unused_configs = true
 strict = false

render_block/base.py

@@ -1,4 +1,5 @@
-from typing import Any, Mapping, Optional, Sequence, Union
+from collections.abc import Mapping, Sequence
+from typing import Any, Optional, Union
 
 from django.http import HttpRequest, HttpResponse
 from django.template import Context, loader

render_block/django.py

@@ -80,6 +80,6 @@ def _render_template_block(block_name: str, context: Context) -> str:
 
     if block_node is None:
         # The wanted block_name was not found.
-        raise BlockNotFound("block with name '%s' does not exist" % block_name)
+        raise BlockNotFound(f"block with name '{block_name}' does not exist")
 
     return block_node.render(context)  # type: ignore[no-any-return]

render_block/jinja2.py

@@ -17,7 +17,7 @@ def jinja2_render_block(
     try:
         gen = template.blocks[block_name](context)
     except KeyError:
-        raise BlockNotFound("block with name '%s' does not exist" % block_name)
+        raise BlockNotFound(f"block with name '{block_name}' does not exist")
 
     # The result from above is a generator which yields unicode strings.
-    return "".join([s for s in gen])
+    return "".join(s for s in gen)

setup.cfg

@@ -42,11 +42,3 @@ python_requires = >=3.8
 [options.extras_require]
 dev =
     Jinja2>=2.8
-
-[flake8]
-extend-ignore = E203
-max-line-length = 88
-
-[isort]
-profile = black
-default_section = THIRDPARTY

tests/settings.py

@@ -24,7 +24,7 @@
     },
 ]
 
-MIDDLEWARE_CLASSES: tuple = tuple()
+MIDDLEWARE_CLASSES: tuple = ()
 
 EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"