update linters, do linting

tykling · tykling · commit da8262900cd6 · 2026-02-28T18:37:07.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,18 +4,18 @@ default_language_version:
 exclude: "^.*\b(migrations)\b.*$"
 repos:
   - repo: "https://github.com/adamchainz/django-upgrade"
-    rev: "1.24.0"
+    rev: "1.30.0"
     hooks:
       - id: "django-upgrade"
         args: ['--target-version', '5.1']
   - repo: "https://github.com/astral-sh/ruff-pre-commit"
-    rev: "v0.11.8"
+    rev: "v0.15.4"
     hooks:
       - id: "ruff"
         args: ["--fix"]
       - id: "ruff-format"
   - repo: "https://github.com/pre-commit/mirrors-mypy"
-    rev: 'v1.15.0'
+    rev: 'v1.19.1'
     hooks:
       - id: "mypy"
         exclude: "src/.*/migrations/.*.py"
diff --git a/src/bornhack_allauth_provider/adapters.py b/src/bornhack_allauth_provider/adapters.py
@@ -34,7 +34,7 @@ def populate_user(self, request: HttpRequest, sociallogin: SocialLogin, data: di
         user_username(sociallogin.user, data.get("username"))
 
         # set initial handle on the user object to the bornhack preferred_username if one is set
-        user_field(sociallogin.user, "handle", data["handle"] if data["handle"] else str(sociallogin.user.uuid))
+        user_field(sociallogin.user, "handle", data["handle"] or str(sociallogin.user.uuid))
 
         # set initial display_name on the user object to the bornhack profiles public_credit_name
         user_field(sociallogin.user, "display_name", data["public_credit_name"])
diff --git a/src/files/api.py b/src/files/api.py
@@ -87,15 +87,15 @@ def upload(  # noqa: C901,PLR0913
 
     Model: type[Image | Video | Audio | Document]  # noqa: N806
     if data["mimetype"] in settings.ALLOWED_IMAGE_TYPES:
-        from images.models import Image as Model
+        from images.models import Image as Model  # noqa: PLC0415
 
         data["aspect_ratio"] = Fraction(data["width"], data["height"])
     elif data["mimetype"] in settings.ALLOWED_VIDEO_TYPES:
-        from videos.models import Video as Model
+        from videos.models import Video as Model  # noqa: PLC0415
     elif data["mimetype"] in settings.ALLOWED_AUDIO_TYPES:
-        from audios.models import Audio as Model
+        from audios.models import Audio as Model  # noqa: PLC0415
     elif data["mimetype"] in settings.ALLOWED_DOCUMENT_TYPES:
-        from documents.models import Document as Model
+        from documents.models import Document as Model  # noqa: PLC0415
     else:
         return 422, {"message": "File type not supported"}
 
diff --git a/src/files/managers.py b/src/files/managers.py
@@ -120,7 +120,7 @@ def prefetch_active_albums_list(self, *, recursive: bool = True) -> Self:
         If recursive is True then each prefetched album also gets a prefetch list of active files.
         """
         # late import to avoid circular import
-        from albums.models import Album
+        from albums.models import Album  # noqa: PLC0415
 
         if recursive:
             qs = (
diff --git a/src/files/models.py b/src/files/models.py
@@ -234,7 +234,7 @@ def license_url(self) -> str:
     @property
     def source(self) -> str:
         """Consider the BMA canonical URL the source if no other source has been specified."""
-        return self.original_source if self.original_source else self.get_absolute_url()
+        return self.original_source or self.get_absolute_url()
 
     def get_absolute_url(self) -> str:
         """The detail url for the file."""
@@ -392,7 +392,7 @@ def create_thumbnail_jobs(self) -> None:
                 continue
 
             # file missing, an unfinished job to create one should exist
-            job, created = ThumbnailJob.objects.get_or_create(
+            job, _created = ThumbnailJob.objects.get_or_create(
                 basefile=self,
                 width=version.width,
                 height=version.height,
diff --git a/src/hitcounter/utils.py b/src/hitcounter/utils.py
@@ -113,4 +113,4 @@ def get_ip(request: HttpRequest) -> str:
     # this will raise an exception if the IP is not valid
     validate_ip(ip_address.strip())
     # all good
-    return ip_address
+    return str(ip_address)
diff --git a/src/images/models.py b/src/images/models.py
@@ -117,7 +117,7 @@ def create_fullsize_version_jobs(self) -> None:
             if self.get_fullsize_version(mimetype=mimetype):
                 continue
             # create job for this filetype
-            job, created = ImageConversionJob.objects.get_or_create(
+            ImageConversionJob.objects.get_or_create(
                 basefile=self,
                 width=self.width,
                 height=self.height,
@@ -129,7 +129,7 @@ def create_fullsize_version_jobs(self) -> None:
     def create_exif_job(self) -> None:
         """Create exif data extraction job."""
         # get exif data?
-        job, created = ImageExifExtractionJob.objects.get_or_create(
+        ImageExifExtractionJob.objects.get_or_create(
             basefile=self,
             source_url=self.original.url,
             finished=False,
@@ -142,7 +142,7 @@ def create_smaller_version_jobs(self) -> None:
             if version.path.exists():
                 continue
             # file missing, a new job must be created
-            job, created = ImageConversionJob.objects.get_or_create(
+            ImageConversionJob.objects.get_or_create(
                 basefile=self,
                 width=version.width,
                 height=version.height,
diff --git a/src/jobs/managers.py b/src/jobs/managers.py
@@ -15,9 +15,9 @@ class JobManager(RelatedPolymorphicManager):
 
     def get_queryset(self) -> models.QuerySet["BaseJob"]:  # type: ignore[override]
         """Prefetch and annotate."""
-        from jobs.models import ImageConversionJob
-        from jobs.models import ThumbnailJob
-        from jobs.models import ThumbnailSourceJob
+        from jobs.models import ImageConversionJob  # noqa: PLC0415
+        from jobs.models import ThumbnailJob  # noqa: PLC0415
+        from jobs.models import ThumbnailSourceJob  # noqa: PLC0415
 
         return (  # type: ignore[no-any-return]
             super()  # type: ignore[attr-defined]
diff --git a/src/jobs/models.py b/src/jobs/models.py
@@ -178,7 +178,7 @@ class ImageConversionJob(ImageJob):
 
     def handle_result(self, f: UploadedFile, data: dict[str, str]) -> None:
         """Save the result of an ImageConversionJob."""
-        from images.models import ImageVersion
+        from images.models import ImageVersion  # noqa: PLC0415
 
         # create model instance
         image = ImageVersion(
@@ -226,7 +226,7 @@ class ThumbnailSourceJob(BaseJob):
 
     def handle_result(self, f: UploadedFile, data: dict[str, str]) -> None:
         """Handle the result of a ThumbnailSourceJob."""
-        from files.models import ThumbnailSource
+        from files.models import ThumbnailSource  # noqa: PLC0415
 
         # delete any existing ThumbnailSource for this file
         ts = ThumbnailSource(  # type: ignore[misc]
@@ -266,7 +266,7 @@ class ThumbnailJob(ImageJob):
 
     def handle_result(self, f: UploadedFile, data: dict[str, str]) -> None:
         """Save the result of a ThumbnailJob as a Thumbnail object."""
-        from files.models import Thumbnail
+        from files.models import Thumbnail  # noqa: PLC0415
 
         # set thumbnailsource FK?
         if hasattr(self.basefile, "thumbnailsource"):
diff --git a/src/jobs/tests/test_api.py b/src/jobs/tests/test_api.py
@@ -196,7 +196,7 @@ def upload_result(self, job: dict[str, str], data: tuple[str, BytesIO] | BytesIO
         filepath: str | Path = settings.BASE_DIR / "static_src/images/file-video-solid.png"
         with Path(filepath).open("rb") as f:
             payload = {
-                "data": data if data else f,
+                "data": data or f,
                 "client": json.dumps(
                     {"client_uuid": "3fa85f64-5717-4562-b3fc-2c963f66afa6", "client_version": "test-1.2.3"}
                 ),
diff --git a/src/manage.py b/src/manage.py
@@ -9,7 +9,7 @@ def main() -> None:
     """Run administrative tasks."""
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bma.settings")
     try:
-        from django.core.management import execute_from_command_line
+        from django.core.management import execute_from_command_line  # noqa: PLC0415
     except ImportError as exc:
         raise ImportError(  # noqa: TRY003
             "Couldn't import Django. Are you sure it's installed and "
diff --git a/src/pictures/models.py b/src/pictures/models.py
@@ -197,7 +197,7 @@ def __init__(  # noqa: PLR0913
 
     def check(self, **kwargs: str) -> list[ValueError | checks.CheckMessage]:  # type: ignore[override]
         """Run the checks."""
-        return FileField.check(self, **kwargs) + self._check_aspect_ratios() + self._check_width_height_field()  # type: ignore[operator]
+        return FileField.check(self, **kwargs) + self._check_aspect_ratios() + self._check_width_height_field()
 
     def _check_aspect_ratios(self) -> list[ValueError]:
         """Check each aspect ratio configured on the field."""
diff --git a/src/users/apps.py b/src/users/apps.py
@@ -13,10 +13,10 @@ class UsersConfig(AppConfig):
 
     def ready(self) -> None:
         """Connect signal to create groups on first request."""
-        from utils.signals import bma_startup
+        from utils.signals import bma_startup  # noqa: PLC0415
 
-        from .models import User
-        from .signals import create_webapp_oauth_app
+        from .models import User  # noqa: PLC0415
+        from .signals import create_webapp_oauth_app  # noqa: PLC0415
 
         request_started.connect(bma_startup, dispatch_uid="bma_startup_signal")
         post_save.connect(create_webapp_oauth_app, sender=User, dispatch_uid="create_webapp_oauth_app")
diff --git a/src/users/views.py b/src/users/views.py
@@ -63,7 +63,7 @@ class BmaCliConfigDownloadView(LoginRequiredMixin, View):
     def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:  # type: ignore[no-untyped-def]
         """Return the JSON config."""
         redirect_uris = [f"https://{hostname}/api/csrf/" for hostname in settings.ALLOWED_HOSTS]
-        app, app_created = Application.objects.get_or_create(
+        app, _created = Application.objects.get_or_create(
             user=request.user,
             redirect_uris=" ".join(redirect_uris),
             client_type="public",
diff --git a/src/utils/ninjafix.py b/src/utils/ninjafix.py
@@ -5,10 +5,10 @@
 
 def monkeypatch_ninja_uuid_converter() -> None:
     """Workaround https://github.com/vitalik/django-ninja/issues/1266 for now."""
-    import importlib
-    import sys
+    import importlib  # noqa: PLC0415
+    import sys  # noqa: PLC0415
 
-    import django.urls
+    import django.urls  # noqa: PLC0415
 
     module_name = "ninja.signature.utils"
     sys.modules.pop(module_name, None)
diff --git a/src/utils/signals.py b/src/utils/signals.py
@@ -18,25 +18,25 @@
 def bma_startup(sender: "WSGIHandler", **kwargs: dict[str, str]) -> None:
     """Create the BMA groups and disconnect signal."""
     logger.debug("This is the first request, running bma_startup()...")
-    from django.contrib.auth.models import Group
+    from django.contrib.auth.models import Group  # noqa: PLC0415
 
     # create creator group if needed
-    creator_group, created = Group.objects.get_or_create(name=settings.BMA_CREATOR_GROUP_NAME)
+    _creator_group, created = Group.objects.get_or_create(name=settings.BMA_CREATOR_GROUP_NAME)
     if created:
         logger.info(f"Created creator group {settings.BMA_CREATOR_GROUP_NAME}")
 
     # create moderator group if needed
-    moderator_group, created = Group.objects.get_or_create(name=settings.BMA_MODERATOR_GROUP_NAME)
+    _moderator_group, created = Group.objects.get_or_create(name=settings.BMA_MODERATOR_GROUP_NAME)
     if created:
         logger.info(f"Created moderator group {settings.BMA_MODERATOR_GROUP_NAME}")
 
     # create creator group if needed
-    curator_group, created = Group.objects.get_or_create(name=settings.BMA_CURATOR_GROUP_NAME)
+    _curator_group, created = Group.objects.get_or_create(name=settings.BMA_CURATOR_GROUP_NAME)
     if created:
         logger.info(f"Created curator group {settings.BMA_CURATOR_GROUP_NAME}")
 
     # create worker group if needed
-    worker_group, created = Group.objects.get_or_create(name=settings.BMA_WORKER_GROUP_NAME)
+    _worker_group, created = Group.objects.get_or_create(name=settings.BMA_WORKER_GROUP_NAME)
     if created:
         logger.info(f"Created worker group {settings.BMA_WORKER_GROUP_NAME}")
 
diff --git a/src/utils/storage.py b/src/utils/storage.py
@@ -49,7 +49,7 @@ def url(self, name: str | None) -> str:
                 name,
             ):
                 # file is an original
-                user, filetype, filename = parts
+                _user, filetype, filename = parts
                 pk = filename.split(".")[0].split("_")[2]
                 prefix = f"o{filetype[0]}"
 
@@ -58,7 +58,7 @@ def url(self, name: str | None) -> str:
                 name,
             ):
                 # file is a thumbnailsource
-                user, filetype, filedir, filename = parts
+                _user, filetype, _filedir, filename = parts
                 pk = filename.split(".")[0].split("_")[1]
                 prefix = "ts"
 
@@ -67,7 +67,7 @@ def url(self, name: str | None) -> str:
                 name,
             ):
                 # file is an imageversion
-                user, filetype, filedir, aspectratio, filename = parts
+                _user, filetype, _filedir, _aspectratio, filename = parts
                 pk = filename.split(".")[0].split("_")[2]
                 prefix = "iv"
 
@@ -76,7 +76,7 @@ def url(self, name: str | None) -> str:
                 name,
             ):
                 # file is a thumbnail
-                user, filetype, filedir, _, aspectratio, filename = parts
+                _user, filetype, _filedir, _, _aspectratio, filename = parts
                 pk = filename.split(".")[0].split("_")[2]
                 prefix = "t"
 
diff --git a/src/utils/templatetags/bma_utils.py b/src/utils/templatetags/bma_utils.py
@@ -49,7 +49,7 @@ def thumbnail(  # noqa: PLR0913
     prefix: str = "",
 ) -> str:
     """BMA thumbnail tag. Depends on the hardcoded 50,100,150,200px (and 2x)."""
-    from files.models import ThumbnailSource
+    from files.models import ThumbnailSource  # noqa: PLC0415
 
     if width not in [50, 100, 150, 200, 300, 400]:
         return mark_safe(  # noqa: S308
diff --git a/src/utils/tests.py b/src/utils/tests.py
@@ -235,7 +235,7 @@ def album_create_api(
             {
                 "title": title,
                 "description": description,
-                "files": files if files else [],
+                "files": files or [],
             },
             headers={"authorization": cls.tokens[getattr(cls, creator)]},
             content_type="application/json",
@@ -259,7 +259,7 @@ def album_create_view(
             data={
                 "title": title,
                 "description": description,
-                "files": files if files else [],
+                "files": files or [],
             },
             follow=True,
         )
