Merge branch 'master' into f213-patch-2

Author: f213

{{ cookiecutter.name }}/Makefile

@@ -43,6 +43,7 @@ lint-yaml:
 	fi
 
 test:
+	@mkdir -p static  # be sure dir for static files exists
 	uv run pytest --dead-fixtures
 	uv run pytest --create-db --exitfirst --numprocesses ${SIMULTANEOUS_TEST_JOBS}
 

{{ cookiecutter.name }}/pyproject.toml

@@ -8,7 +8,6 @@ dependencies = [
     "bcrypt>=4.3.0",
     "celery==5.4.0",
     "django-axes>=7.0.2",
-    "django-behaviors>=0.5.1",
     "django-environ>=0.12.0",
     "django-filter>=25.1",
     "django-healthchecks>=1.5.0",
@@ -33,10 +32,11 @@ dev = [
     "django-stubs>=5.2.0",
     "djangorestframework-stubs>=3.16.0",
     "dotenv-linter>=0.7.0",
+    "faker>=37.8.0",
     "freezegun>=1.5.1",
     "ipython>=9.2.0",
     "jedi>=0.19.2",
-    "mixer>=7.2.2",
+    "model-bakery>=1.20.5",
     "mypy>=1.15.0",
     "pymarkdownlnt>=0.9.29",
     "pytest-deadfixtures>=2.2.1",
@@ -160,6 +160,9 @@ combine-as-imports = true
 known-first-party = ["src"]
 lines-after-imports = 2
 
+[tool.ruff.lint.mccabe]
+max-complexity = 6
+
 [tool.ruff.lint.per-file-ignores]
 "*/factory.py" = [
     "ANN",  # flake8-annotations
@@ -228,7 +231,6 @@ module = [
     "djangorestframework_camel_case.*",
     "drf_orjson_renderer.*",
     "ipware.*",
-    "mixer.*",
 ]
 ignore_missing_imports = true
 

{{ cookiecutter.name }}/src/app/conf/celery.py

@@ -4,6 +4,7 @@
 
 CELERY_BROKER_URL = env("CELERY_BROKER_URL", cast=str, default="redis://localhost:6379/0")
 CELERY_TASK_ALWAYS_EAGER = env("CELERY_TASK_ALWAYS_EAGER", cast=bool, default=env("DEBUG"))
+CELERY_TASK_EAGER_PROPAGATES = True
 CELERY_TIMEZONE = TIME_ZONE
 CELERY_ENABLE_UTC = False
 CELERY_TASK_ACKS_LATE = True

{{ cookiecutter.name }}/src/app/factory.py

@@ -1,13 +1,9 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
-from faker import Faker
 
 from app.testing import register
 from app.testing.types import FactoryProtocol
 
 
-faker = Faker()
-
-
 @register
 def image(self: FactoryProtocol, name: str = "image.gif", content_type: str = "image/gif") -> SimpleUploadedFile:
-    return SimpleUploadedFile(name=name, content=faker.image(), content_type=content_type)
+    return SimpleUploadedFile(name=name, content=self.faker.image(), content_type=content_type)

{{ cookiecutter.name }}/src/app/models.py

@@ -1,8 +1,10 @@
+from collections.abc import Iterable
 from typing import Any
 
-from behaviors.behaviors import Timestamped  # type: ignore[import-untyped]
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.db.models.base import ModelBase
+from django.utils import timezone
 
 
 __all__ = [
@@ -42,11 +44,30 @@ def get_label(cls) -> str:
         return cls._meta.label_lower.split(".")[-1]
 
 
-class TimestampedModel(DefaultModel, Timestamped):
+class TimestampedModel(DefaultModel):
     """
-    Default app model that has `created` and `updated` attributes.
-    Currently based on https://github.com/audiolion/django-behaviors
+    Default app model that has `created` and `modified` attributes.
     """
 
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(null=True, blank=True)
+
     class Meta:
         abstract = True
+
+    def save(
+        self,
+        *,
+        force_insert: bool | tuple[ModelBase, ...] = False,
+        force_update: bool = False,
+        using: str | None = None,
+        update_fields: Iterable[str] | None = None,
+    ) -> None:
+        if self.pk:
+            self.modified = timezone.now()
+        return super().save(
+            force_insert=force_insert,
+            force_update=force_update,
+            using=using,
+            update_fields=update_fields,
+        )

{{ cookiecutter.name }}/src/app/testing/factory.py

@@ -1,7 +1,8 @@
 from collections.abc import Callable
 from functools import partial
 
-from app.testing.mixer import mixer
+from faker import Faker
+from model_bakery import baker
 
 
 def register(method: Callable) -> Callable:
@@ -31,7 +32,8 @@ def __getattr__(self, name: str) -> Callable:
 
 class FixtureFactory:
     def __init__(self) -> None:
-        self.mixer = mixer
+        self.baker = baker  # imported module
+        self.faker = Faker()
         self.registry = FixtureRegistry()
 
     def __getattr__(self, name: str) -> Callable:

{{ cookiecutter.name }}/src/app/testing/mixer.py

@@ -1,10 +1,12 @@
+from types import ModuleType
 from typing import Protocol
 
-from mixer.backend.django import mixer
+from faker import Faker
 
 
 class FactoryProtocol(Protocol):
-    mixer: mixer
+    baker: ModuleType
+    faker: Faker
 
 
 __all__ = [

{{ cookiecutter.name }}/src/app/testing/types.py

@@ -7,7 +7,7 @@
 
 @register
 def user(self: FactoryProtocol, **kwargs: dict) -> User:
-    return self.mixer.blend("users.User", **kwargs)
+    return self.baker.make("users.User", **kwargs)
 
 
 @register