[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

funnel/assets/sass/mui/_custom.scss

@@ -36,9 +36,10 @@ $mui-body-bg-color: $mui-bg-color-accent !default;
 $mui-btn-danger-bg-color: $mui-text-danger;
 
 $mui-base-font-color: $mui-text-dark !default;
-$mui-base-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
-  Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math',
-  'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+$mui-base-font-family:
+  -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
+  'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math', 'Apple Color Emoji',
+  'Segoe UI Emoji', 'Segoe UI Symbol';
 $mui-base-font-size: 14px !default;
 $mui-base-font-size-desktop: 16px !default;
 $mui-base-font-weight: 400 !default;

funnel/models/helpers.py

@@ -732,12 +732,12 @@ def coerce(cls, _key: str, value: Any) -> Self:
 
     @classmethod
     def create(
-        cls: type[_MC],
+        cls,
         name: str,
         deferred: bool = False,
         deferred_group: str | None = None,
         **kwargs: Any,
-    ) -> tuple[sa_orm.Composite[_MC], Mapped[str], Mapped[str]]:
+    ) -> tuple[sa_orm.Composite[Self], Mapped[str], Mapped[str]]:
         """Create a composite column and backing individual columns."""
         col_text = sa_orm.mapped_column(
             name + '_text',

funnel/models/membership_mixin.py

@@ -634,9 +634,7 @@ def pickername(self: FrozenAttributionSubclassProtocol) -> str:
         return self._title if self._title else self.member.pickername
 
     @with_roles(call={'owner', 'member'})
-    def freeze_member_attribution(
-        self: FrozenAttributionType, actor: Account
-    ) -> FrozenAttributionType:
+    def freeze_member_attribution(self, actor: Account) -> Self:
         """Freeze member attribution and return a replacement record."""
         if self._title is None:
             membership = self.replace(actor=actor, title=self.member.title)
@@ -687,9 +685,7 @@ def __setattr__(self, attr: str, value: Any) -> None:
             raise AttributeError(
                 f"{attr} cannot be set",
                 name=attr,
-                obj=SimpleNamespace(
-                    **{_: None for _ in self.membership.__data_columns__}
-                ),
+                obj=SimpleNamespace(**dict.fromkeys(self.membership.__data_columns__)),
             )
         self._new[attr] = value
 

funnel/models/reorder_mixin.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Protocol, TypeVar
+from typing import Any, Protocol, Self, TypeVar
 
 from .base import Mapped, db, declarative_mixin, sa, sa_orm
 from .typing import ModelIdProtocol
@@ -23,7 +23,7 @@ class ReorderSubclassProtocol(ModelIdProtocol, Protocol):
     @property
     def parent_scoped_reorder_query_filter(self) -> sa.ColumnElement[bool]: ...
 
-    def reorder_item(self: Reorderable, other: Reorderable, before: bool) -> None: ...
+    def reorder_item(self, other: Self, before: bool) -> None: ...
 
 
 Reorderable = TypeVar('Reorderable', bound='ReorderSubclassProtocol')
@@ -47,7 +47,7 @@ def parent_scoped_reorder_query_filter(
         cls = self.__class__
         return cls.parent_id == self.parent_id
 
-    def reorder_item(self: Reorderable, other: Reorderable, before: bool) -> None:
+    def reorder_item(self, other: Self, before: bool) -> None:
         """Reorder self before or after other item."""
         cls = self.__class__
 
@@ -121,10 +121,10 @@ def reorder_item(self: Reorderable, other: Reorderable, before: bool) -> None:
         self.seq = new_seq_number
         db.session.flush()
 
-    def reorder_before(self: Reorderable, other: Reorderable) -> None:
+    def reorder_before(self, other: Self) -> None:
         """Reorder to be before another item's sequence number."""
         self.reorder_item(other, True)
 
-    def reorder_after(self: Reorderable, other: Reorderable) -> None:
+    def reorder_after(self, other: Self) -> None:
         """Reorder to be after another item's sequence number."""
         self.reorder_item(other, False)

funnel/static/css/app.css

@@ -1690,9 +1690,10 @@ html {
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
-    Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math',
-    'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+  font-family:
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
+    'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math', 'Apple Color Emoji',
+    'Segoe UI Emoji', 'Segoe UI Symbol';
   font-size: 14px;
   font-weight: 400;
   line-height: 1.5;

funnel/views/otp.py

@@ -4,7 +4,7 @@
 
 from dataclasses import dataclass
 from datetime import timedelta
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic, Self, TypeVar
 
 import phonenumbers
 from flask import current_app, flash, render_template, request, session, url_for
@@ -134,13 +134,13 @@ def __init_subclass__(cls, *args: Any, **kwargs: Any) -> None:
 
     @classmethod
     def make(
-        cls: type[OtpSessionType],
+        cls,
         reason: str,
         user: OptionalAccountType,
         anchor: Anchor | None,
         phone: str | None = None,
         email: str | None = None,
-    ) -> OtpSessionType:
+    ) -> Self:
         """
         Create an OTP for login and save it to cache and browser cookie session.
 
@@ -172,7 +172,7 @@ def make(
         )
 
     @classmethod
-    def retrieve(cls: type[OtpSessionType], reason: str) -> OtpSessionType:
+    def retrieve(cls, reason: str) -> Self:
         """Retrieve an OTP from cache using the token in browser cookie session."""
         otp_token = session.get('otp')
         if not otp_token:

tests/conftest.py

@@ -492,7 +492,7 @@ def backup_and_apply_config(
     ) -> None:
         if key in saved_config:
             pytest.fail(f"Duplicate mock for {app_name}.config[{key!r}]")
-        if key in app_fixture.config:  # noqa: SIM401
+        if key in app_fixture.config:
             saved_config[key] = app_fixture.config[key]
         else:
             saved_config[key] = ...  # Sentinel value

tests/unit/utils/md/conftest.py

@@ -99,12 +99,7 @@ def load(cls) -> None:
                         ),
                     )
                     for md_configname, config in {
-                        **{
-                            p: None
-                            for p in config.get(  # type: ignore[union-attr]
-                                'profiles', []
-                            )
-                        },
+                        **dict.fromkeys(config.get('profiles', [])),
                         **config.get('custom_profiles', {}),  # type: ignore[union-attr]
                     }.items()
                 }