chore: Improve ruff config (#64)

* fix: Remove isort because ruff is running it * chore: Run pyupgrade * chore: Run codespell * chore: Run trailing-whitespace * chore: Trial preferred ruff rules * chore: Rearrange ruff rules and add ignore on setup.py * chore: Run new ruff rules * chore: Fix coverage result ignore * chore: Fix comma
django-cms · Dec 6, 2023 · f3cb3ef · f3cb3ef
1 parent beed4a2
commit f3cb3ef
Show file tree

Hide file tree

Showing 81 changed files with 262 additions and 244 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,5 +26,5 @@ Use 'x' to check each item: [x] I have ...
 * [ ] I have opened this pull request against ``master``
 * [ ] I have added or modified the tests when changing logic
 * [ ] I have followed [the conventional commits guidelines](https://www.conventionalcommits.org/) to add meaningful information into the changelog
-* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst) and I have joined #workgroup-pr-review on 
+* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst) and I have joined #workgroup-pr-review on
 [Slack](https://www.django-cms.org/slack) to find a “pr review buddy” who is going to review my pull request.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 *.log
 *.pot
 .DS_Store
-.coverage
+.coverage*
 .coverage/
 .eggs/
 .idea/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -39,11 +39,6 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.5
     hooks:

diff --git a/README.rst b/README.rst
@@ -9,7 +9,7 @@ that allows you to create a HTML container containing classes, styles, ids
 and other attributes definable through the plugins settings.
 
 
-.. note:: 
+.. note::
 
     This project is considered 3rd party (no supervision by the `django CMS Association <https://www.django-cms.org/en/about-us/>`_). Join us on `Slack                 <https://www.django-cms.org/slack/>`_ for more information.
 
@@ -22,8 +22,8 @@ Contribute to this project and win rewards
 
 Because this is a an open-source project, we welcome everyone to
 `get involved in the project <https://www.django-cms.org/en/contribute/>`_ and
-`receive a reward <https://www.django-cms.org/en/bounty-program/>`_ for their contribution. 
-Become part of a fantastic community and help us make django CMS the best CMS in the world.   
+`receive a reward <https://www.django-cms.org/en/bounty-program/>`_ for their contribution.
+Become part of a fantastic community and help us make django CMS the best CMS in the world.
 
 We'll be delighted to receive your
 feedback in the form of issues and pull requests. Before submitting your

diff --git a/aldryn_config.py b/aldryn_config.py
@@ -2,41 +2,41 @@
 
 
 def split_and_strip(string):
-    return [item.strip() for item in string.split(',') if item]
+    return [item.strip() for item in string.split(",") if item]
 
 
 class Form(forms.BaseForm):
     templates = forms.CharField(
-        'List of additional templates (comma separated)',
+        "List of additional templates (comma separated)",
         required=False,
     )
     class_names = forms.CharField(
-        'List of classes (comma separated)',
+        "List of classes (comma separated)",
         required=False,
     )
     tag_types = forms.CharField(
-        'List of HTML tags (comma separated)',
+        "List of HTML tags (comma separated)",
         required=False,
     )
 
     def clean(self):
-        data = super(Form, self).clean()
+        data = super().clean()
 
         # prettify
-        data['templates'] = ', '.join(split_and_strip(data['templates']))
-        data['class_names'] = ', '.join(split_and_strip(data['class_names']))
-        data['tag_types'] = ', '.join(split_and_strip(data['tag_types']))
+        data["templates"] = ", ".join(split_and_strip(data["templates"]))
+        data["class_names"] = ", ".join(split_and_strip(data["class_names"]))
+        data["tag_types"] = ", ".join(split_and_strip(data["tag_types"]))
         return data
 
     def to_settings(self, data, settings):
-        if data['templates']:
-            settings['DJANGOCMS_STYLE_TEMPLATES'] = [
+        if data["templates"]:
+            settings["DJANGOCMS_STYLE_TEMPLATES"] = [
                 (item, item)
-                for item in split_and_strip(data['templates'])
+                for item in split_and_strip(data["templates"])
             ]
-        if data['class_names']:
-            settings['DJANGOCMS_STYLE_CHOICES'] = split_and_strip(data['class_names'])
-        if data['tag_types']:
-            settings['DJANGOCMS_STYLE_TAGS'] = split_and_strip(data['tag_types'])
+        if data["class_names"]:
+            settings["DJANGOCMS_STYLE_CHOICES"] = split_and_strip(data["class_names"])
+        if data["tag_types"]:
+            settings["DJANGOCMS_STYLE_TAGS"] = split_and_strip(data["tag_types"])
 
         return settings
diff --git a/djangocms_style/__init__.py b/djangocms_style/__init__.py
@@ -1 +1 @@
-__version__ = '3.0.0'
+__version__ = "3.0.0"
diff --git a/djangocms_style/cms_plugins.py b/djangocms_style/cms_plugins.py
@@ -7,42 +7,42 @@
 
 class StylePlugin(CMSPluginBase):
     model = Style
-    name = _('Style')
-    render_template = 'djangocms_style/style.html'
+    name = _("Style")
+    render_template = "djangocms_style/style.html"
     allow_children = True
 
     fieldsets = (
         (None, {
-            'fields': (
-                'label',
-                ('class_name', 'tag_type'),
+            "fields": (
+                "label",
+                ("class_name", "tag_type"),
             )
         }),
-        (_('Advanced settings'), {
-            'classes': ('collapse',),
-            'fields': (
-                'additional_classes',
-                'id_name',
-                'template',
-                'attributes',
+        (_("Advanced settings"), {
+            "classes": ("collapse",),
+            "fields": (
+                "additional_classes",
+                "id_name",
+                "template",
+                "attributes",
             ),
         }),
-        (_('Inline style settings'), {
-            'classes': ('collapse',),
-            'fields': (
-                ('padding_top', 'padding_right',
-                 'padding_bottom', 'padding_left'),
-                ('margin_top', 'margin_right',
-                 'margin_bottom', 'margin_left'),
+        (_("Inline style settings"), {
+            "classes": ("collapse",),
+            "fields": (
+                ("padding_top", "padding_right",
+                 "padding_bottom", "padding_left"),
+                ("margin_top", "margin_right",
+                 "margin_bottom", "margin_left"),
             ),
         }),
     )
 
     def get_render_template(self, context, instance, placeholder):
-        return 'djangocms_style/{}/style.html'.format(instance.template)
+        return f"djangocms_style/{instance.template}/style.html"
 
     def render(self, context, instance, placeholder):
-        context['inline_styles'] = instance.get_styles()
+        context["inline_styles"] = instance.get_styles()
         return super().render(context, instance, placeholder)
 
 

diff --git a/djangocms_style/locale/af/LC_MESSAGES/django.po b/djangocms_style/locale/af/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/ar/LC_MESSAGES/django.po b/djangocms_style/locale/ar/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/be/LC_MESSAGES/django.po b/djangocms_style/locale/be/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/bg/LC_MESSAGES/django.po b/djangocms_style/locale/bg/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/ca/LC_MESSAGES/django.po b/djangocms_style/locale/ca/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/cmn/LC_MESSAGES/django.po b/djangocms_style/locale/cmn/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/cs/LC_MESSAGES/django.po b/djangocms_style/locale/cs/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/da/LC_MESSAGES/django.po b/djangocms_style/locale/da/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/de/LC_MESSAGES/django.po b/djangocms_style/locale/de/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/el/LC_MESSAGES/django.po b/djangocms_style/locale/el/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/en/LC_MESSAGES/django.po b/djangocms_style/locale/en/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/es/LC_MESSAGES/django.po b/djangocms_style/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/es_AR/LC_MESSAGES/django.po b/djangocms_style/locale/es_AR/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/es_BO/LC_MESSAGES/django.po b/djangocms_style/locale/es_BO/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/et/LC_MESSAGES/django.po b/djangocms_style/locale/et/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/eu/LC_MESSAGES/django.po b/djangocms_style/locale/eu/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/fa/LC_MESSAGES/django.po b/djangocms_style/locale/fa/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/fi/LC_MESSAGES/django.po b/djangocms_style/locale/fi/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/fr/LC_MESSAGES/django.po b/djangocms_style/locale/fr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/ga/LC_MESSAGES/django.po b/djangocms_style/locale/ga/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/gl/LC_MESSAGES/django.po b/djangocms_style/locale/gl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/gu/LC_MESSAGES/django.po b/djangocms_style/locale/gu/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/he/LC_MESSAGES/django.po b/djangocms_style/locale/he/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/hi/LC_MESSAGES/django.po b/djangocms_style/locale/hi/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""

diff --git a/djangocms_style/locale/hr/LC_MESSAGES/django.po b/djangocms_style/locale/hr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""