Update linters

Use ruff to replace all existing linters.
Add pyupgrade and django-upgrade to keep code clean.

Author: codingjoe

.github/workflows/ci.yml

@@ -13,11 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         lint-command:
-          - bandit -r . -x ./tests
-          - black --check --diff .
-          - flake8 .
-          - isort --check-only --diff .
-          - pydocstyle .
+          - ruff format --check .
+          - ruff check --output-format=github .
+          - django-upgrade --check `git ls-files | grep .py`
+          - pyupgrade `git ls-files | grep .py`
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5

docs/conf.py

@@ -33,7 +33,7 @@
 }
 
 try:
-    import sphinxcontrib.spelling  # noqa
+    import sphinxcontrib.spelling  # noqa: F401
 except ImportError:
     pass
 else:

mailauth/contrib/admin/views.py

@@ -11,14 +11,12 @@ class AdminLoginView(LoginView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context.update(
-            {
-                **self.site.each_context(self.request),
-                "title": _("Log in"),
-                "app_path": self.request.get_full_path(),
-                "username": self.request.user.get_username(),
-            }
-        )
+        context.update({
+            **self.site.each_context(self.request),
+            "title": _("Log in"),
+            "app_path": self.request.get_full_path(),
+            "username": self.request.user.get_username(),
+        })
         if (
             REDIRECT_FIELD_NAME not in self.request.GET
             and REDIRECT_FIELD_NAME not in self.request.POST

mailauth/contrib/user/admin.py

@@ -1,6 +1,9 @@
 from django.contrib import admin
 from django.contrib.auth.models import Group, Permission
-from django.utils.translation import gettext_lazy as _, ngettext
+from django.utils.translation import (
+    gettext_lazy as _,
+    ngettext,
+)
 
 from . import models
 

mailauth/forms.py

@@ -35,7 +35,7 @@ def get_login_url(self, request, token, next=None):
             path=reverse("mailauth:login-token", kwargs={"token": token}),
         )
         if next is not None:
-            url += "?next=%s" % urllib.parse.quote(next)
+            url += f"?next={urllib.parse.quote(next)}"
         return url
 
     def get_token(self, user):
@@ -107,7 +107,7 @@ def get_users(self, email=None):
         if connection.vendor == "postgresql":
             query = {self.field_name: email}
         else:
-            query = {"%s__iexact" % self.field_name: email}
+            query = {f"{self.field_name}__iexact": email}
         return get_user_model()._default_manager.filter(**query).iterator()
 
     def save(self):

mailauth/signing.py

@@ -87,14 +87,14 @@ def unsign(self, value, max_age=None, single_use=True):
         try:
             user = get_user_model()._default_manager.get(pk=user_pk)
         except get_user_model().DoesNotExist as e:
-            raise UserDoesNotExist("User with pk=%s does not exist" % user_pk) from e
+            raise UserDoesNotExist(f"User with pk={user_pk} does not exist") from e
         else:
             if (
                 single_use
                 and last_login != ""
                 and self.to_timestamp(user.last_login) != last_login
             ):
                 raise signing.SignatureExpired(
-                    "The access token for %r seems used" % user
+                    f"The access token for {user!r} seems used"
                 )
             return user

mailauth/views.py

@@ -43,7 +43,7 @@ def get_initial(self):
         }
 
 
-INTERNAL_LOGIN_URL_TOKEN = "login-token"  # nosec
+INTERNAL_LOGIN_URL_TOKEN = "login-token"  # noqa: S105
 
 
 class LoginTokenView(DjangoLoginView):
@@ -61,10 +61,9 @@ def get(self, request, *args, **kwargs):
         user = authenticate(request, token=token)
         if user is None:
             raise PermissionDenied
-        else:
-            login(self.request, user=user)
-            # Remove token from the HTTP Referer header
-            self.request.path.replace(token, INTERNAL_LOGIN_URL_TOKEN)
+        login(self.request, user=user)
+        # Remove token from the HTTP Referer header
+        self.request.path.replace(token, INTERNAL_LOGIN_URL_TOKEN)
 
         return response.HttpResponseRedirect(self.get_success_url())
 

pyproject.toml

@@ -52,11 +52,9 @@ test = [
   "pytest-django",
 ]
 lint = [
-  "bandit==1.8.6",
-  "black==25.1.0",
-  "flake8==7.3.0",
-  "isort==6.0.1",
-  "pydocstyle[toml]==6.3.0",
+  "ruff==0.13.1",
+  "pyupgrade==3.20.0",
+  "django-upgrade==1.28.0",
 ]
 docs = [
   "sphinx",
@@ -93,17 +91,50 @@ source = ["mailauth"]
 [tool.coverage.report]
 show_missing = true
 
-[tool.isort]
-atomic = true
-line_length = 88
-multi_line_output = 3
-force_grid_wrap = 0
-known_first_party = "mailauth, tests"
-include_trailing_comma = true
-use_parentheses = true
-default_section = "THIRDPARTY"
-combine_as_imports = true
-skip = ["mailauth/_version.py"]
-
-[tool.pydocstyle]
-add_ignore = "D1"
+[tool.ruff]
+src = ["mailauth", "tests"]
+line-length = 88
+indent-width = 4
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
+preview = true
+
+[tool.ruff.lint]
+select = [
+    "D", # pydocstyle
+    "E", # pycodestyle errors
+    "EXE", # flake8-executable
+    "F", # pyflakes
+    "I", # isort
+    "PGH", # pygrep-hooks
+    "PT", # flake8-pytest-style
+    "RET", # flake8-return
+    "S", # flake8-bandit
+    "SIM", # flake8-simplify
+    "UP", # pyupgrade
+    "W", # pycodestyle warnings
+]
+
+ignore = ["D1"]
+
+[tool.ruff.lint.per-file-ignores]
+"*/test*.py" = ["S101", "PLR2004"]
+"*/migrations/*.py" = ["E501"]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+mark-parentheses = false
+
+[tool.ruff.lint.isort]
+combine-as-imports = true
+split-on-trailing-comma = true
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+force-wrap-aliases = true
+known-first-party = ["mailauth", "tests"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "pep257"

setup.cfg

@@ -14,7 +14,7 @@ def timestamp(self):
         return "1Hjptg"
 
 
-@pytest.fixture()
+@pytest.fixture
 def user(db):
     """Return a user instance."""
     return get_user_model().objects.create_user(
@@ -24,7 +24,7 @@ def user(db):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def admin_user(db):
     """Return a user instance."""
     return get_user_model().objects.create_user(
@@ -35,13 +35,13 @@ def admin_user(db):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def signature():
     """Return a signature matching the user fixture."""
     return "LZ:173QUS:1Hjptg:6oq5DS1NJ7SxJ1o-CpfgaqrImVaRpkcHrzV9yltwcHM"
 
 
-@pytest.fixture()
+@pytest.fixture
 def signer():
     """Return a forzen version of the UserSigner."""
     return FrozenUserSigner()