fix: ruff issues

Author: fsbraun

tests/settings.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 try:
-    import djangocms_versioning
+    import djangocms_versioning  #NOQA: F401
 
     add_apps = ['djangocms_versioning']
 except ImportError:
@@ -12,7 +12,8 @@
     'INSTALLED_APPS': [
         'tests.utils',
         'djangocms_snippet',
-    ] + add_apps,
+        *add_apps,
+    ],
     'CMS_LANGUAGES': {
         1: [{
             'code': 'en',

tests/test_admin.py

@@ -1,15 +1,14 @@
 from importlib import reload
 from unittest import skipIf
 
+from cms import __version__ as cms_version
+from cms.test_utils.testcases import CMSTestCase
+from cms.utils import get_current_site
 from django.contrib import admin
 from django.contrib.sites.models import Site
 from django.shortcuts import reverse
 from django.test import RequestFactory, override_settings
 
-from cms import __version__ as cms_version
-from cms.test_utils.testcases import CMSTestCase
-from cms.utils import get_current_site
-
 try:
     from djangocms_versioning.models import Version
 except ImportError:

tests/test_config.py

@@ -1,9 +1,8 @@
 from unittest import skipIf
 
-from django.apps import apps
-
 from cms import __version__ as cms_version
 from cms.test_utils.testcases import CMSTestCase
+from django.apps import apps
 
 from djangocms_snippet.models import Snippet, SnippetGrouper
 

tests/test_forms.py

@@ -1,10 +1,9 @@
 from importlib import reload
 from unittest import skipIf
 
-from django.test import override_settings
-
 from cms import __version__ as cms_version
 from cms.test_utils.testcases import CMSTestCase
+from django.test import override_settings
 
 from djangocms_snippet import forms
 from djangocms_snippet.forms import SnippetPluginForm

tests/test_migrations.py

@@ -3,11 +3,10 @@
 from io import StringIO
 from unittest import skipIf
 
+from cms import __version__ as cms_version
 from django.core.management import call_command
 from django.test import TestCase, override_settings
 
-from cms import __version__ as cms_version
-
 
 class MigrationTestCase(TestCase):
 

tests/test_plugins.py

@@ -2,9 +2,9 @@
 from unittest import skipIf
 
 from cms import __version__ as cms_version
-
 from cms.api import add_plugin, create_page
 from cms.test_utils.testcases import CMSTestCase
+
 try:
     from djangocms_versioning.models import Version
 except ImportError:

tests/test_templatetags.py

@@ -1,9 +1,8 @@
+from cms.test_utils.testcases import CMSTestCase
 from django.core.exceptions import ObjectDoesNotExist
 from django.template import Context, Template
 from django.template.exceptions import TemplateSyntaxError
 
-from cms.test_utils.testcases import CMSTestCase
-
 from .utils.factories import SnippetPluginFactory, SnippetWithVersionFactory
 
 

tests/utils/factories.py

@@ -1,17 +1,14 @@
 import string
 
+import factory
+from cms.models import Placeholder
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-
-from cms.models import Placeholder
-
-import factory
 from django.db import models
 from factory.fuzzy import FuzzyInteger, FuzzyText
 
 from djangocms_snippet.models import Snippet, SnippetGrouper, SnippetPtr
 
-
 try:
     from djangocms_versioning.models import Version
 except ImportError:
@@ -23,7 +20,7 @@ class UserFactory(factory.django.DjangoModelFactory):
     first_name = factory.Faker("first_name")
     last_name = factory.Faker("last_name")
     email = factory.LazyAttribute(
-        lambda u: "%s.%s@example.com" % (u.first_name.lower(), u.last_name.lower())
+        lambda u: f"{u.first_name.lower()}.{u.last_name.lower()}@example.com"
     )
 
     class Meta:
@@ -45,7 +42,7 @@ class AbstractVersionFactory(factory.django.DjangoModelFactory):
     created_by = factory.SubFactory(UserFactory)
 
     class Meta:
-        exclude = ["content"]
+        exclude = ("content",)
         abstract = True
 
 

tests/utils/models.py

@@ -1,9 +1,7 @@
+from cms import __version__ as cms_version
 from django.conf import settings
 from django.db import models
 
-from cms import __version__ as cms_version
-
-
 if cms_version < "4":
     class Version(models.Model):
         content = models.ForeignKey("djangocms_snippet.Snippet", related_name="versions", on_delete=models.CASCADE)
@@ -12,13 +10,15 @@ class Version(models.Model):
         )
         state = models.CharField(max_length=50, default="draft")
 
+        def __str__(self):
+            return f"{self.content} - {self.state}"
+
         def __init__(self, *args, **kwargs):
             kwargs.pop("content_type", None)
             obj_id = kwargs.pop("object_id", None)
             if obj_id:
                 kwargs["content_id"] = obj_id
             super().__init__(*args, **kwargs)
 
-
         def publish(self, user):
             pass