Fix remove isort from pre-commit

fsbraun · fsbraun · commit baabe0d249a6 · 2024-11-10T17:57:23.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,16 +13,13 @@ repos:
       hooks:
           - id: pyupgrade
             args: ["--py39-plus"]
+
     - repo: https://github.com/adamchainz/django-upgrade
       rev: "1.22.1"
       hooks:
           - id: django-upgrade
             args: [--target-version, "4.2"]
-    - repo: https://github.com/pycqa/isort
-      rev: 5.13.2
-      hooks:
-          - id: isort
-            name: isort (python)
+
     - repo: https://github.com/PyCQA/flake8
       rev: 7.1.1
       hooks:
diff --git a/djangocms_frontend/common/__init__.py b/djangocms_frontend/common/__init__.py
@@ -5,7 +5,6 @@
 from .attributes import AttributesMixin
 from .title import TitleFormMixin, TitleMixin
 
-
 __common = {
     "background": ("BackgroundFormMixin", "BackgroundMixin"),
     "responsive": ("ResponsiveFormMixin", "ResponsiveMixin"),
diff --git a/djangocms_frontend/contrib/alert/forms.py b/djangocms_frontend/contrib/alert/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend import settings
@@ -11,7 +10,6 @@
 from djangocms_frontend.models import FrontendUIItem
 from djangocms_frontend.settings import COLOR_STYLE_CHOICES
 
-
 mixin_factory = settings.get_forms(alert)
 
 
diff --git a/djangocms_frontend/contrib/badge/forms.py b/djangocms_frontend/contrib/badge/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend.fields import AttributesFormField, ColoredButtonGroup, TagTypeFormField
diff --git a/djangocms_frontend/contrib/card/cms_plugins.py b/djangocms_frontend/contrib/card/cms_plugins.py
@@ -1,6 +1,5 @@
-from django.utils.translation import gettext_lazy as _
-
 from cms.plugin_pool import plugin_pool
+from django.utils.translation import gettext_lazy as _
 
 from ... import settings
 from ...cms_plugins import CMSUIPlugin
@@ -9,7 +8,6 @@
 from .. import card
 from . import forms, models
 
-
 mixin_factory = settings.get_renderer(card)
 
 
diff --git a/djangocms_frontend/contrib/card/forms.py b/djangocms_frontend/contrib/card/forms.py
@@ -2,7 +2,6 @@
 
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend.settings import COLOR_STYLE_CHOICES, DEVICE_SIZES
@@ -16,7 +15,6 @@
 from ..grid.constants import GRID_SIZE
 from .constants import CARD_ALIGNMENT_CHOICES, CARD_INNER_TYPE_CHOICES, CARD_LAYOUT_TYPE_CHOICES
 
-
 # card allow for a transparent color
 CARD_COLOR_STYLE_CHOICES = settings.COLOR_STYLE_CHOICES + (("transparent", _("Transparent")),)
 
diff --git a/djangocms_frontend/contrib/carousel/forms.py b/djangocms_frontend/contrib/carousel/forms.py
@@ -1,7 +1,6 @@
 from django import forms
 from django.db.models.fields.related import ManyToOneRel
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 from filer.fields.image import AdminImageFormField, FilerImageField
 from filer.models import Image
@@ -16,10 +15,12 @@
 from .. import carousel
 from ..link.forms import LinkFormMixin
 from .constants import (
-    CAROUSEL_ASPECT_RATIO_CHOICES, CAROUSEL_PAUSE_CHOICES, CAROUSEL_TEMPLATE_CHOICES, CAROUSEL_TRANSITION_CHOICES,
+    CAROUSEL_ASPECT_RATIO_CHOICES,
+    CAROUSEL_PAUSE_CHOICES,
+    CAROUSEL_TEMPLATE_CHOICES,
+    CAROUSEL_TRANSITION_CHOICES,
 )
 
-
 mixin_factory = settings.get_forms(carousel)
 
 
diff --git a/djangocms_frontend/contrib/grid/cms_plugins.py b/djangocms_frontend/contrib/grid/cms_plugins.py
@@ -1,6 +1,5 @@
-from django.utils.translation import gettext_lazy as _
-
 from cms.plugin_pool import plugin_pool
+from django.utils.translation import gettext_lazy as _
 
 from djangocms_frontend import settings
 from djangocms_frontend.common import AttributesMixin, BackgroundMixin, ResponsiveMixin, SizingMixin, SpacingMixin
@@ -11,7 +10,6 @@
 from .. import grid
 from . import forms, models
 
-
 mixin_factory = settings.get_renderer(grid)
 
 
diff --git a/djangocms_frontend/contrib/grid/forms.py b/djangocms_frontend/contrib/grid/forms.py
@@ -3,7 +3,6 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend import settings
@@ -15,11 +14,13 @@
 from ...common.title import TitleFormMixin
 from .. import grid
 from .constants import (
-    GRID_COLUMN_ALIGNMENT_CHOICES, GRID_CONTAINER_CHOICES, GRID_ROW_HORIZONTAL_ALIGNMENT_CHOICES,
-    GRID_ROW_VERTICAL_ALIGNMENT_CHOICES, GRID_SIZE,
+    GRID_COLUMN_ALIGNMENT_CHOICES,
+    GRID_CONTAINER_CHOICES,
+    GRID_ROW_HORIZONTAL_ALIGNMENT_CHOICES,
+    GRID_ROW_VERTICAL_ALIGNMENT_CHOICES,
+    GRID_SIZE,
 )
 
-
 mixin_factory = settings.get_forms(grid)
 
 
diff --git a/djangocms_frontend/contrib/icon/forms.py b/djangocms_frontend/contrib/icon/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend.fields import AttributesFormField, ColoredButtonGroup, TagTypeFormField
diff --git a/djangocms_frontend/contrib/jumbotron/forms.py b/djangocms_frontend/contrib/jumbotron/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend import settings
@@ -10,7 +9,6 @@
 from djangocms_frontend.fields import AttributesFormField, TagTypeFormField, TemplateChoiceMixin
 from djangocms_frontend.helpers import first_choice
 
-
 mixin_factory = settings.get_forms(jumbotron)
 
 
diff --git a/djangocms_frontend/contrib/link/forms.py b/djangocms_frontend/contrib/link/forms.py
@@ -2,12 +2,11 @@
 from django.conf import settings as django_settings
 from django.contrib.sites.models import Site
 from django.utils.translation import gettext as _
+from djangocms_link.fields import LinkFormField
 
 # from djangocms_link.validators import IntranetURLValidator
 from entangled.forms import EntangledModelForm, EntangledModelFormMixin
 
-from djangocms_link.fields import LinkFormField
-
 from ... import settings
 from ...common import SpacingFormMixin
 from ...fields import AttributesFormField, ButtonGroup, ColoredButtonGroup, TagTypeFormField, TemplateChoiceMixin
@@ -16,7 +15,6 @@
 from .. import link
 from .constants import LINK_CHOICES, LINK_SIZE_CHOICES, TARGET_CHOICES
 
-
 mixin_factory = settings.get_forms(link)
 
 if "djangocms_frontend.contrib.icon" in django_settings.INSTALLED_APPS:
diff --git a/djangocms_frontend/contrib/link/models.py b/djangocms_frontend/contrib/link/models.py
@@ -1,11 +1,11 @@
 from django.utils.translation import gettext as _
 
 from djangocms_frontend.contrib.link.helpers import GetLinkMixin
+
 # 'link' type is added manually as it is only required for this plugin
 from djangocms_frontend.models import FrontendUIItem
 from djangocms_frontend.settings import COLOR_STYLE_CHOICES
 
-
 COLOR_STYLE_CHOICES = (("link", _("Link")),) + COLOR_STYLE_CHOICES
 
 
diff --git a/djangocms_frontend/contrib/listgroup/forms.py b/djangocms_frontend/contrib/listgroup/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend import settings
diff --git a/djangocms_frontend/contrib/navigation/cms_plugins.py b/djangocms_frontend/contrib/navigation/cms_plugins.py
@@ -1,6 +1,5 @@
-from django.utils.translation import gettext_lazy as _
-
 from cms.plugin_pool import plugin_pool
+from django.utils.translation import gettext_lazy as _
 
 from ... import settings
 from ...cms_plugins import CMSUIPlugin
@@ -10,7 +9,6 @@
 from ..link.cms_plugins import LinkPluginMixin, TextLinkPlugin
 from . import forms, models
 
-
 mixin_factory = settings.get_renderer(navigation)
 
 default_template = first_choice(settings.NAVIGATION_TEMPLATE_CHOICES)
diff --git a/djangocms_frontend/contrib/navigation/forms.py b/djangocms_frontend/contrib/navigation/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-
 from entangled.forms import EntangledModelForm
 
 from djangocms_frontend import settings
@@ -12,7 +11,6 @@
 from djangocms_frontend.models import FrontendUIItem
 from djangocms_frontend.settings import NAVBAR_DESIGNS
 
-
 mixin_factory = settings.get_forms(navigation)
 
 
diff --git a/djangocms_frontend/contrib/tabs/forms.py b/djangocms_frontend/contrib/tabs/forms.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext as _
-
 from entangled.forms import EntangledModelForm
 
 from ... import settings
diff --git a/djangocms_frontend/contrib/utilities/forms.py b/djangocms_frontend/contrib/utilities/forms.py
@@ -1,7 +1,6 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext as _
-
 from entangled.forms import EntangledModelForm
 
 from ... import settings
@@ -11,7 +10,6 @@
 from ...models import FrontendUIItem
 from .. import utilities
 
-
 mixin_factory = settings.get_forms(utilities)
 
 
diff --git a/djangocms_frontend/helpers.py b/djangocms_frontend/helpers.py
@@ -1,6 +1,9 @@
 import copy
 import decimal
 
+from cms.constants import SLUG_REGEXP
+from cms.plugin_base import CMSPluginBase
+from cms.utils.conf import get_cms_setting
 from django.apps import apps
 from django.contrib.admin.helpers import AdminForm
 from django.db.models import ObjectDoesNotExist
@@ -12,10 +15,6 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
-from cms.constants import SLUG_REGEXP
-from cms.plugin_base import CMSPluginBase
-from cms.utils.conf import get_cms_setting
-
 from djangocms_frontend import settings
 from djangocms_frontend.settings import FRAMEWORK_PLUGIN_INFO
 
diff --git a/djangocms_frontend/management/bootstrap4_migration.py b/djangocms_frontend/management/bootstrap4_migration.py
@@ -1,5 +1,4 @@
 from django.conf import settings as django_setting
-
 from djangocms_bootstrap4.constants import DEVICE_SIZES
 
 from djangocms_frontend import settings
diff --git a/djangocms_frontend/ui_plugin_base.py b/djangocms_frontend/ui_plugin_base.py
@@ -1,11 +1,9 @@
 # Import the components from the current directory's models module
-from django.utils.encoding import force_str
-
 from cms.plugin_base import CMSPluginBase
+from django.utils.encoding import force_str
 
 from djangocms_frontend.helpers import get_related
 
-
 try:
     from cms.admin.placeholderadmin import PlaceholderAdmin
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -69,6 +69,9 @@ select = [
   "B",
   "B950",
 ]
+ignore = [
+  "W503", # line break before binary operator
+]
 exclude = [
   "*.egg-info",
   ".eggs",
diff --git a/tests/test_plugin_tag.py b/tests/test_plugin_tag.py
@@ -80,14 +80,14 @@ def test_link_plugin(self):
             {% plugin "textlink" name="Click" url_grouper=grouper site=test_site link_type="btn" link_context="primary" link_outline=False %}
                 Click me!
             {% endplugin %}
-        """)  # noqa: B950
+        """)  # noqa: B950,E501
         else:
             grouper = None
             template = django_engine.from_string("""{% load frontend djangocms_link_tags %}{{ "test"|to_link }}
                 {% plugin "textlink" name="Click" link="/test/"|to_link link_type="btn" link_context="primary" link_outline=False %}
                     Click me!
                 {% endplugin %}
-            """)  # noqa: B950
+            """)  # noqa: B950,E501
 
         expected_result = """<a href="/test/" class="btn btn-primary">Click me!</a>"""
 
