Migrate formatting and linting to Ruff (#1004)

Author: adamchainz

.pre-commit-config.yaml

@@ -34,40 +34,23 @@ repos:
   - id: rstcheck
     additional_dependencies:
     - tomli==2.0.1
-- repo: https://github.com/asottile/pyupgrade
-  rev: ce40a160603ab0e7d9c627ae33d7ef3906e2d2b2  # frozen: v3.19.1
-  hooks:
-  - id: pyupgrade
-    args: [--py39-plus]
 - repo: https://github.com/adamchainz/django-upgrade
   rev: 700530171ecf380bc829a64388f49d14ecd61c53  # frozen: 1.25.0
   hooks:
   - id: django-upgrade
     args: [--target-version, '4.2']
-- repo: https://github.com/psf/black-pre-commit-mirror
-  rev: a4920527036bb9a3f3e6055d595849d67d0da066  # frozen: 25.1.0
-  hooks:
-  - id: black
 - repo: https://github.com/adamchainz/blacken-docs
   rev: 78a9dcbecf4f755f65d1f3dec556bc249d723600  # frozen: 1.19.1
   hooks:
   - id: blacken-docs
     additional_dependencies:
     - black==25.1.0
-- repo: https://github.com/pycqa/isort
-  rev: c8ab4a5b21bac924d106e3103dd7c979fdd0f9bc  # frozen: 6.0.1
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: 12753357c00c3fb8615100354c9fdc6ab80b044d  # frozen: v0.11.10
   hooks:
-    - id: isort
-      name: isort (python)
-- repo: https://github.com/PyCQA/flake8
-  rev: 4b5e89b4b108a6c1a000c591d334a99a80d34c7b  # frozen: 7.2.0
-  hooks:
-  - id: flake8
-    additional_dependencies:
-    - flake8-bugbear
-    - flake8-comprehensions
-    - flake8-logging
-    - flake8-tidy-imports
+    - id: ruff-check
+      args: [ --fix ]
+    - id: ruff-format
 - repo: https://github.com/pre-commit/mirrors-mypy
   rev: f40886d54c729f533f864ed6ce584e920feb0af7  # frozen: v1.15.0
   hooks:

pyproject.toml

@@ -66,12 +66,42 @@ django50 = [ "django>=5.0a1,<5.1; python_version>='3.10'" ]
 django51 = [ "django>=5.1a1,<5.2; python_version>='3.10'" ]
 django52 = [ "django>=5.2a1,<6; python_version>='3.10'" ]
 
-[tool.isort]
-add_imports = [
-  "from __future__ import annotations",
+[tool.ruff]
+lint.select = [
+  # flake8-bugbear
+  "B",
+  # flake8-comprehensions
+  "C4",
+  # pycodestyle
+  "E",
+  # Pyflakes errors
+  "F",
+  # isort
+  "I",
+  # flake8-simplify
+  "SIM",
+  # flake8-tidy-imports
+  "TID",
+  # pyupgrade
+  "UP",
+  # Pyflakes warnings
+  "W",
 ]
-force_single_line = true
-profile = "black"
+lint.ignore = [
+  # flake8-bugbear opinionated rules
+  "B9",
+  # line-too-long
+  "E501",
+  # suppressible-exception
+  "SIM105",
+  # if-else-block-instead-of-if-exp
+  "SIM108",
+]
+lint.extend-safe-fixes = [
+  # non-pep585-annotation
+  "UP006",
+]
+lint.isort.required-imports = [ "from __future__ import annotations" ]
 
 [tool.pyproject-fmt]
 max_supported_python = "3.13"

src/corsheaders/apps.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 from django.apps import AppConfig
-from django.core.checks import Tags
-from django.core.checks import register
+from django.core.checks import Tags, register
 
 from corsheaders.checks import check_settings
 

src/corsheaders/checks.py

@@ -6,8 +6,7 @@
 from urllib.parse import urlsplit
 
 from django.conf import settings
-from django.core.checks import CheckMessage
-from django.core.checks import Error
+from django.core.checks import CheckMessage, Error
 
 from corsheaders.conf import conf
 
@@ -99,9 +98,7 @@ def check_settings(**kwargs: Any) -> list[CheckMessage]:
             if parsed.scheme == "" or parsed.netloc == "":
                 errors.append(
                     Error(
-                        "Origin {} in {} is missing scheme or netloc".format(
-                            repr(origin), allowed_origins_alias
-                        ),
+                        f"Origin {repr(origin)} in {allowed_origins_alias} is missing scheme or netloc",
                         id="corsheaders.E013",
                         hint=(
                             "Add a scheme (e.g. https://) or netloc (e.g. "
@@ -116,9 +113,7 @@ def check_settings(**kwargs: Any) -> list[CheckMessage]:
                     if getattr(parsed, part) != "":
                         errors.append(
                             Error(
-                                "Origin {} in {} should not have {}".format(
-                                    repr(origin), allowed_origins_alias, part
-                                ),
+                                f"Origin {repr(origin)} in {allowed_origins_alias} should not have {part}",
                                 id="corsheaders.E014",
                             )
                         )
@@ -130,9 +125,7 @@ def check_settings(**kwargs: Any) -> list[CheckMessage]:
     if not is_sequence(conf.CORS_ALLOWED_ORIGIN_REGEXES, (str, re_type)):
         errors.append(
             Error(
-                "{} should be a sequence of strings and/or compiled regexes.".format(
-                    allowed_regexes_alias
-                ),
+                f"{allowed_regexes_alias} should be a sequence of strings and/or compiled regexes.",
                 id="corsheaders.E007",
             )
         )

src/corsheaders/conf.py

@@ -2,13 +2,11 @@
 
 from collections.abc import Sequence
 from re import Pattern
-from typing import Union
-from typing import cast
+from typing import Union, cast
 
 from django.conf import settings
 
-from corsheaders.defaults import default_headers
-from corsheaders.defaults import default_methods
+from corsheaders.defaults import default_headers, default_methods
 
 
 class Settings:

src/corsheaders/middleware.py

@@ -3,13 +3,10 @@
 import re
 from collections.abc import Awaitable
 from typing import Callable
-from urllib.parse import SplitResult
-from urllib.parse import urlsplit
+from urllib.parse import SplitResult, urlsplit
 
-from asgiref.sync import iscoroutinefunction
-from asgiref.sync import markcoroutinefunction
-from django.http import HttpRequest
-from django.http import HttpResponse
+from asgiref.sync import iscoroutinefunction, markcoroutinefunction
+from django.http import HttpRequest, HttpResponse
 from django.http.response import HttpResponseBase
 from django.utils.cache import patch_vary_headers
 

tests/test_checks.py

@@ -3,10 +3,8 @@
 import re
 
 import pytest
-from django.core.checks import CheckMessage
-from django.core.checks import Error
-from django.core.management import base
-from django.core.management import call_command
+from django.core.checks import CheckMessage, Error
+from django.core.management import base, call_command
 from django.test import SimpleTestCase
 from django.test.utils import override_settings
 

tests/test_middleware.py

@@ -7,15 +7,16 @@
 from django.test.utils import override_settings
 from django.utils.deprecation import MiddlewareMixin
 
-from corsheaders.middleware import ACCESS_CONTROL_ALLOW_CREDENTIALS
-from corsheaders.middleware import ACCESS_CONTROL_ALLOW_HEADERS
-from corsheaders.middleware import ACCESS_CONTROL_ALLOW_METHODS
-from corsheaders.middleware import ACCESS_CONTROL_ALLOW_ORIGIN
-from corsheaders.middleware import ACCESS_CONTROL_ALLOW_PRIVATE_NETWORK
-from corsheaders.middleware import ACCESS_CONTROL_EXPOSE_HEADERS
-from corsheaders.middleware import ACCESS_CONTROL_MAX_AGE
-from tests.utils import prepend_middleware
-from tests.utils import temporary_check_request_handler
+from corsheaders.middleware import (
+    ACCESS_CONTROL_ALLOW_CREDENTIALS,
+    ACCESS_CONTROL_ALLOW_HEADERS,
+    ACCESS_CONTROL_ALLOW_METHODS,
+    ACCESS_CONTROL_ALLOW_ORIGIN,
+    ACCESS_CONTROL_ALLOW_PRIVATE_NETWORK,
+    ACCESS_CONTROL_EXPOSE_HEADERS,
+    ACCESS_CONTROL_MAX_AGE,
+)
+from tests.utils import prepend_middleware, temporary_check_request_handler
 
 
 class ShortCircuitMiddleware(MiddlewareMixin):

tox.ini

@@ -27,7 +27,3 @@ dependency_groups =
     django50: django50
     django51: django51
     django52: django52
-
-[flake8]
-max-line-length = 88
-extend-ignore = E203,E501