Merge branch 'main' of https://github.com/bckohan/django-enum

Author: bckohan

.github/workflows/scorecard.yml

@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/[email protected].0
+        uses: ossf/[email protected].1
         with:
           results_file: results.sarif
           results_format: sarif

doc/source/changelog.rst

@@ -4,6 +4,11 @@
 Change Log
 ==========
 
+v2.2.0 (2025-03-07)
+===================
+
+* Implemented `Move form imports to locally scoped imports where needed in fields.py <https://github.com/bckohan/django-enum/issues/79>`_
+
 v2.1.0 (2025-02-24)
 ===================
 

pyproject.toml

@@ -60,7 +60,7 @@ packages = ["src/django_enum"]
 
 
 [project.optional-dependencies]
-properties = ["enum-properties>=2.0.0"]
+properties = ["enum-properties>=2.2.0"]
 filters = ["django-filter>=21"]
 rest = ["djangorestframework>=3.9,<4.0"]
 

src/django_enum/fields.py

@@ -42,13 +42,6 @@
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
-from django_enum.forms import (
-    EnumChoiceField,
-    EnumFlagField,
-    FlagSelectMultiple,
-    NonStrictSelect,
-    NonStrictSelectMultiple,
-)
 from django_enum.query import (  # HasAllFlagsExtraBigLookup,
     HasAllFlagsLookup,
     HasAnyFlagsLookup,
@@ -669,6 +662,13 @@ def formfield(self, form_class=None, choices_form_class=None, **kwargs):
         #   we try to pass in. Very annoying because we have to
         #   un-encapsulate some of this initialization logic, this makes our
         #   EnumChoiceField pretty ugly!
+        from django_enum.forms import (
+            EnumChoiceField,
+            EnumFlagField,
+            FlagSelectMultiple,
+            NonStrictSelect,
+            NonStrictSelectMultiple,
+        )
 
         is_multi = self.enum and issubclass(self.enum, Flag)
         if is_multi and self.enum: