model-bakery 1.17.0__tar.gz → 1.18.1__tar.gz

{model_bakery-1.17.0 → model_bakery-1.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: model-bakery
-Version: 1.17.0
+Version: 1.18.1
 Summary: Smart object creation facility for Django.
 Project-URL: Homepage, https://github.com/model-bakers/model_bakery
 Author-email: berin <bernardoxhc@gmail.com>, amureki <amureki@hey.com>
@@ -9,9 +9,8 @@ License-File: LICENSE
 Keywords: django,factory,python,testing
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
@@ -24,8 +23,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development
 Requires-Python: >=3.8
-Requires-Dist: django>=3.2
+Requires-Dist: django>=4.2
 Provides-Extra: docs
+Requires-Dist: myst-parser; extra == 'docs'
 Requires-Dist: sphinx; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme; extra == 'docs'
 Provides-Extra: test

model_bakery-1.18.1/model_bakery/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.18.1"

{model_bakery-1.17.0 → model_bakery-1.18.1}/model_bakery/baker.py

@@ -15,10 +15,8 @@ from typing import (
     overload,
 )
 
-from django import VERSION as DJANGO_VERSION
 from django.apps import apps
 from django.conf import settings
-from django.contrib import contenttypes
 from django.db.models import (
     AutoField,
     BooleanField,
@@ -37,6 +35,7 @@ from django.db.models.fields.reverse_related import ManyToOneRel, OneToOneRel
 
 from . import generators, random_gen
 from ._types import M, NewM
+from .content_types import BAKER_CONTENTTYPES
 from .exceptions import (
     AmbiguousModelName,
     CustomBakerNotFound,
@@ -50,6 +49,13 @@ from .utils import (
     seq,  # noqa: F401 - Enable seq to be imported from recipes
 )
 
+if BAKER_CONTENTTYPES:
+    from django.contrib.contenttypes import models as contenttypes_models
+    from django.contrib.contenttypes.fields import GenericRelation
+else:
+    contenttypes_models = None
+    GenericRelation = None
+
 recipes = None
 
 # FIXME: use pkg_resource
@@ -78,8 +84,7 @@ def make(
     _using: str = "",
     _bulk_create: bool = False,
     **attrs: Any,
-) -> M:
-    ...
+) -> M: ...
 
 
 @overload
@@ -94,8 +99,7 @@ def make(
     _bulk_create: bool = False,
     _fill_optional: Union[List[str], bool] = False,
     **attrs: Any,
-) -> List[M]:
-    ...
+) -> List[M]: ...
 
 
 def make(
@@ -147,8 +151,7 @@ def prepare(
     _save_related: bool = False,
     _using: str = "",
     **attrs,
-) -> M:
-    ...
+) -> M: ...
 
 
 @overload
@@ -159,8 +162,7 @@ def prepare(
     _using: str = "",
     _fill_optional: Union[List[str], bool] = False,
     **attrs,
-) -> List[M]:
-    ...
+) -> List[M]: ...
 
 
 def prepare(
@@ -567,13 +569,9 @@ class Baker(Generic[M]):
         }
         self.model_attrs = {k: v for k, v in attrs.items() if not is_rel_field(k)}
         self.rel_attrs = {k: v for k, v in attrs.items() if is_rel_field(k)}
-        self.rel_fields = [
-            x.split("__")[0] for x in self.rel_attrs.keys() if is_rel_field(x)
-        ]
-
-    def _skip_field(self, field: Field) -> bool:
-        from django.contrib.contenttypes.fields import GenericRelation
+        self.rel_fields = [x.split("__")[0] for x in self.rel_attrs if is_rel_field(x)]
 
+    def _skip_field(self, field: Field) -> bool:  # noqa: C901
         # check for fill optional argument
         if isinstance(self.fill_in_optional, bool):
             field.fill_optional = self.fill_in_optional
@@ -595,10 +593,18 @@ class Baker(Generic[M]):
         if isinstance(field, OneToOneField) and self._remote_field(field).parent_link:
             return True
 
-        if isinstance(field, (AutoField, GenericRelation, OrderWrt)):
+        other_fields_to_skip = [
+            AutoField,
+            OrderWrt,
+        ]
+
+        if BAKER_CONTENTTYPES:
+            other_fields_to_skip.append(GenericRelation)
+
+        if isinstance(field, tuple(other_fields_to_skip)):
             return True
 
-        if all(
+        if all(  # noqa: SIM102
             [
                 field.name not in self.model_attrs,
                 field.name not in self.rel_fields,
@@ -614,7 +620,7 @@ class Baker(Generic[M]):
             ):
                 return True
 
-        if field.name not in self.model_attrs:
+        if field.name not in self.model_attrs:  # noqa: SIM102
             if field.name not in self.rel_fields and (
                 field.null and not field.fill_optional
             ):
@@ -689,9 +695,11 @@ class Baker(Generic[M]):
         `attr_mapping` and `type_mapping` can be defined easily overwriting the
         model.
         """
-        is_content_type_fk = isinstance(field, ForeignKey) and issubclass(
-            self._remote_field(field).model, contenttypes.models.ContentType
-        )
+        is_content_type_fk = False
+        if BAKER_CONTENTTYPES:
+            is_content_type_fk = isinstance(field, ForeignKey) and issubclass(
+                self._remote_field(field).model, contenttypes_models.ContentType
+            )
         # we only use default unless the field is overwritten in `self.rel_fields`
         if field.has_default() and field.name not in self.rel_fields:
             if callable(field.default):
@@ -702,7 +710,7 @@ class Baker(Generic[M]):
         elif field.choices:
             generator = random_gen.gen_from_choices(field.choices)
         elif is_content_type_fk:
-            generator = self.type_mapping[contenttypes.models.ContentType]
+            generator = self.type_mapping[contenttypes_models.ContentType]
         elif generators.get(field.__class__):
             generator = generators.get(field.__class__)
         elif field.__class__ in self.type_mapping:
@@ -820,12 +828,7 @@ def bulk_create(baker: Baker[M], quantity: int, **kwargs) -> List[M]:
     else:
         manager = baker.model._base_manager
 
-    existing_entries = list(manager.values_list("pk", flat=True))
     created_entries = manager.bulk_create(entries)
-    # bulk_create in Django < 4.0 does not return ids of created objects.
-    #  drop this after 01 Apr 2024 (Django 3.2 LTS end of life)
-    if DJANGO_VERSION < (4, 0):
-        created_entries = manager.exclude(pk__in=existing_entries)
 
     # set many-to-many relations from kwargs
     for entry in created_entries:

model_bakery-1.18.1/model_bakery/content_types.py

@@ -0,0 +1,14 @@
+from django.apps import apps
+
+BAKER_CONTENTTYPES = apps.is_installed("django.contrib.contenttypes")
+
+default_contenttypes_mapping = {}
+
+__all__ = ["BAKER_CONTENTTYPES", "default_contenttypes_mapping"]
+
+if BAKER_CONTENTTYPES:
+    from django.contrib.contenttypes.models import ContentType
+
+    from . import random_gen
+
+    default_contenttypes_mapping[ContentType] = random_gen.gen_content_type

{model_bakery-1.17.0 → model_bakery-1.18.1}/model_bakery/generators.py

@@ -3,6 +3,8 @@ from typing import Any, Callable, Dict, Optional, Type, Union
 
 from django.db.backends.base.operations import BaseDatabaseOperations
 from django.db.models import (
+    AutoField,
+    BigAutoField,
     BigIntegerField,
     BinaryField,
     BooleanField,
@@ -19,11 +21,14 @@ from django.db.models import (
     ImageField,
     IntegerField,
     IPAddressField,
+    JSONField,
     ManyToManyField,
     OneToOneField,
+    PositiveBigIntegerField,
     PositiveIntegerField,
     PositiveSmallIntegerField,
     SlugField,
+    SmallAutoField,
     SmallIntegerField,
     TextField,
     TimeField,
@@ -34,40 +39,12 @@ from django.db.models import (
 from . import random_gen
 from .utils import import_from_str
 
-try:
-    # Proper support starts with Django 3.0
-    #  (as it uses `django/db/backends/base/operations.py` for matching ranges)
-    from django.db.models import AutoField, BigAutoField, SmallAutoField
-except ImportError:
-    AutoField = None
-    BigAutoField = None
-    SmallAutoField = None
-
-try:
-    # added in Django 3.1
-    from django.db.models import PositiveBigIntegerField
-except ImportError:
-    PositiveBigIntegerField = None
-
-try:
-    # Replaced `django.contrib.postgres.fields.JSONField` in Django 3.1
-    from django.db.models import JSONField
-except ImportError:
-    JSONField = None
-
 try:
     # PostgreSQL-specific field (only available when psycopg is installed)
     from django.contrib.postgres.fields import ArrayField
 except ImportError:
     ArrayField = None
 
-try:
-    # Deprecated since Django 3.1, removed in Django 4.0
-    # PostgreSQL-specific field (only available when psycopg is installed)
-    from django.contrib.postgres.fields import JSONField as PostgresJSONField
-except ImportError:
-    PostgresJSONField = None
-
 try:
     # PostgreSQL-specific field (only available when psycopg is installed)
     from django.contrib.postgres.fields import HStoreField
@@ -86,12 +63,6 @@ except ImportError:
     CIEmailField = None
     CITextField = None
 
-try:
-    # Deprecated since Django 3.1, removed in Django 4.0
-    from django.db.models import NullBooleanField
-except ImportError:
-    NullBooleanField = None
-
 
 try:
     # PostgreSQL-specific fields (only available when psycopg is installed)
@@ -124,9 +95,13 @@ default_mapping = {
     OneToOneField: random_gen.gen_related,
     ManyToManyField: random_gen.gen_m2m,
     BooleanField: random_gen.gen_boolean,
+    AutoField: _make_integer_gen_by_range(AutoField),
+    BigAutoField: _make_integer_gen_by_range(BigAutoField),
     IntegerField: _make_integer_gen_by_range(IntegerField),
+    SmallAutoField: _make_integer_gen_by_range(SmallAutoField),
     BigIntegerField: _make_integer_gen_by_range(BigIntegerField),
     SmallIntegerField: _make_integer_gen_by_range(SmallIntegerField),
+    PositiveBigIntegerField: _make_integer_gen_by_range(PositiveBigIntegerField),
     PositiveIntegerField: _make_integer_gen_by_range(PositiveIntegerField),
     PositiveSmallIntegerField: _make_integer_gen_by_range(PositiveSmallIntegerField),
     FloatField: random_gen.gen_float,
@@ -146,14 +121,11 @@ default_mapping = {
     FileField: random_gen.gen_file_field,
     ImageField: random_gen.gen_image_field,
     DurationField: random_gen.gen_interval,
+    JSONField: random_gen.gen_json,
 }  # type: Dict[Type, Callable]
 
 if ArrayField:
     default_mapping[ArrayField] = random_gen.gen_array
-if JSONField:
-    default_mapping[JSONField] = random_gen.gen_json
-if PostgresJSONField:
-    default_mapping[PostgresJSONField] = random_gen.gen_json
 if HStoreField:
     default_mapping[HStoreField] = random_gen.gen_hstore
 if CICharField:
@@ -162,16 +134,6 @@ if CIEmailField:
     default_mapping[CIEmailField] = random_gen.gen_email
 if CITextField:
     default_mapping[CITextField] = random_gen.gen_text
-if AutoField:
-    default_mapping[AutoField] = _make_integer_gen_by_range(AutoField)
-if BigAutoField:
-    default_mapping[BigAutoField] = _make_integer_gen_by_range(BigAutoField)
-if SmallAutoField:
-    default_mapping[SmallAutoField] = _make_integer_gen_by_range(SmallAutoField)
-if PositiveBigIntegerField:
-    default_mapping[PositiveBigIntegerField] = _make_integer_gen_by_range(
-        PositiveBigIntegerField
-    )
 if DecimalRangeField:
     default_mapping[DecimalRangeField] = random_gen.gen_pg_numbers_range(Decimal)
 if IntegerRangeField:
@@ -182,22 +144,18 @@ if DateRangeField:
     default_mapping[DateRangeField] = random_gen.gen_date_range
 if DateTimeRangeField:
     default_mapping[DateTimeRangeField] = random_gen.gen_datetime_range
-if NullBooleanField:
-    default_mapping[NullBooleanField] = random_gen.gen_boolean
 
 
 # Add GIS fields
 
 
 def get_type_mapping() -> Dict[Type, Callable]:
-    from django.contrib.contenttypes.models import ContentType
-
+    from .content_types import default_contenttypes_mapping
     from .gis import default_gis_mapping
 
     mapping = default_mapping.copy()
-    mapping[ContentType] = random_gen.gen_content_type
+    mapping.update(default_contenttypes_mapping)
     mapping.update(default_gis_mapping)
-
     return mapping.copy()
 
 

{model_bakery-1.17.0 → model_bakery-1.18.1}/model_bakery/random_gen.py

@@ -27,7 +27,7 @@ MAX_LENGTH = 300
 # Postgres database.
 MAX_INT = 100000000000
 
-baker_random = Random()
+baker_random = Random()  # noqa: S311
 
 
 def get_content_file(content: bytes, name: str) -> ContentFile:

{model_bakery-1.17.0 → model_bakery-1.18.1}/model_bakery/recipe.py

@@ -52,7 +52,7 @@ class Recipe(Generic[M]):
                     m = finder.get_model(self._model)
                 else:
                     m = self._model
-                if k not in self._iterator_backups or m.objects.count() == 0:
+                if k not in self._iterator_backups or not m.objects.exists():
                     self._iterator_backups[k] = itertools.tee(
                         self._iterator_backups.get(k, [v])[0]
                     )
@@ -94,8 +94,7 @@ class Recipe(Generic[M]):
         _bulk_create: bool = False,
         _save_kwargs: Optional[Dict[str, Any]] = None,
         **attrs: Any,
-    ) -> M:
-        ...
+    ) -> M: ...
 
     @overload
     def make(
@@ -108,8 +107,7 @@ class Recipe(Generic[M]):
         _bulk_create: bool = False,
         _save_kwargs: Optional[Dict[str, Any]] = None,
         **attrs: Any,
-    ) -> List[M]:
-        ...
+    ) -> List[M]: ...
 
     def make(
         self,
@@ -146,8 +144,7 @@ class Recipe(Generic[M]):
         _save_related: bool = False,
         _using: str = "",
         **attrs: Any,
-    ) -> M:
-        ...
+    ) -> M: ...
 
     @overload
     def prepare(
@@ -156,8 +153,7 @@ class Recipe(Generic[M]):
         _save_related: bool = False,
         _using: str = "",
         **attrs: Any,
-    ) -> List[M]:
-        ...
+    ) -> List[M]: ...
 
     def prepare(
         self,

{model_bakery-1.17.0 → model_bakery-1.18.1}/pyproject.toml

@@ -22,9 +22,8 @@ keywords = [
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Framework :: Django",
-    "Framework :: Django :: 3.2",
-    "Framework :: Django :: 4.1",
     "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
@@ -38,7 +37,7 @@ classifiers = [
     "Topic :: Software Development",
 ]
 dependencies = [
-    "django>=3.2",
+    "django>=4.2",
 ]
 
 [project.optional-dependencies]
@@ -54,6 +53,7 @@ test = [
 docs = [
     "Sphinx",
     "sphinx-rtd-theme",
+    "myst-parser",
 ]
 
 [project.urls]
@@ -98,15 +98,17 @@ addopts = "--tb=short -rxs --nomigrations"
 target-version = "py38"
 
 select = [
+    "S", # flake8-bandit
+    "B", # flake8-bugbear
+    "C", # flake8-comprehensions
+    "SIM", # flake8-simplify
+    "I", # isort
     "E", # pycodestyle errors
     "W", # pycodestyle warnings
     "F", # pyflakes
-    "I", # isort
-    "S", # flake8-bandit
     "D", # pydocstyle
     "UP", # pyupgrade
-    "B", # flake8-bugbear
-    "C", # flake8-comprehensions
+    "RUF100", # Unused noqa directive
 ]
 
 ignore = ["B904", "E501", "S101", "D1", "D212"]

model_bakery-1.17.0/model_bakery/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.17.0"