Skip to content

Commit aa2505b

Browse files
ci: auto fixes from pre-commit hooks
for more information, see https://pre-commit.ci
1 parent ec4515f commit aa2505b

File tree

10 files changed

+13
-24
lines changed

10 files changed

+13
-24
lines changed

src/djangocms_snippet/migrations/0009_alter_snippetptr_cmsplugin_ptr.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ class Migration(migrations.Migration):
1818
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='%(app_label)s_%(class)s', serialize=False, to='cms.cmsplugin'),
1919
),
2020
]
21-

tests/requirements/dj32_cms40.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Django>=3.2,<4.0
44

55
# Unreleased django 3.2 & django-cms 4.0.x compatible packages
66
https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms
7-
https://github.com/django-cms/djangocms-versioning/tarball/1.2.2#egg=djangocms-versioning
7+
https://github.com/django-cms/djangocms-versioning/tarball/1.2.2#egg=djangocms-versioning

tests/test_admin.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
from importlib import reload
22
from unittest import skipIf
33

4+
from cms import __version__ as cms_version
5+
from cms.test_utils.testcases import CMSTestCase
6+
from cms.utils import get_current_site
47
from django.contrib import admin
58
from django.contrib.sites.models import Site
69
from django.shortcuts import reverse
710
from django.test import RequestFactory, override_settings
811

9-
from cms import __version__ as cms_version
10-
from cms.test_utils.testcases import CMSTestCase
11-
from cms.utils import get_current_site
12-
1312
try:
1413
from djangocms_versioning.models import Version
1514
except ImportError:

tests/test_config.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
from unittest import skipIf
22

3-
from django.apps import apps
4-
53
from cms import __version__ as cms_version
64
from cms.test_utils.testcases import CMSTestCase
5+
from django.apps import apps
76

87
from djangocms_snippet.models import Snippet, SnippetGrouper
98

tests/test_forms.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from importlib import reload
22
from unittest import skipIf
33

4-
from django.test import override_settings
5-
64
from cms import __version__ as cms_version
75
from cms.test_utils.testcases import CMSTestCase
6+
from django.test import override_settings
87

98
from djangocms_snippet import forms
109
from djangocms_snippet.forms import SnippetPluginForm

tests/test_migrations.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
from io import StringIO
44
from unittest import skipIf
55

6+
from cms import __version__ as cms_version
67
from django.core.management import call_command
78
from django.test import TestCase, override_settings
89

9-
from cms import __version__ as cms_version
10-
1110

1211
class MigrationTestCase(TestCase):
1312

tests/test_plugins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from unittest import skipIf
33

44
from cms import __version__ as cms_version
5-
65
from cms.api import add_plugin, create_page
76
from cms.test_utils.testcases import CMSTestCase
7+
88
try:
99
from djangocms_versioning.models import Version
1010
except ImportError:

tests/test_templatetags.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
from cms.test_utils.testcases import CMSTestCase
12
from django.core.exceptions import ObjectDoesNotExist
23
from django.template import Context, Template
34
from django.template.exceptions import TemplateSyntaxError
45

5-
from cms.test_utils.testcases import CMSTestCase
6-
76
from .utils.factories import SnippetPluginFactory, SnippetWithVersionFactory
87

98

tests/utils/factories.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
import string
22

3+
import factory
4+
from cms.models import Placeholder
35
from django.contrib.auth.models import User
46
from django.contrib.contenttypes.models import ContentType
5-
6-
from cms.models import Placeholder
7-
8-
import factory
97
from django.db import models
108
from factory.fuzzy import FuzzyInteger, FuzzyText
119

1210
from djangocms_snippet.models import Snippet, SnippetGrouper, SnippetPtr
1311

14-
1512
try:
1613
from djangocms_versioning.models import Version
1714
except ImportError:
@@ -23,7 +20,7 @@ class UserFactory(factory.django.DjangoModelFactory):
2320
first_name = factory.Faker("first_name")
2421
last_name = factory.Faker("last_name")
2522
email = factory.LazyAttribute(
26-
lambda u: "%s.%s@example.com" % (u.first_name.lower(), u.last_name.lower())
23+
lambda u: f"{u.first_name.lower()}.{u.last_name.lower()}@example.com"
2724
)
2825

2926
class Meta:

tests/utils/models.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
from cms import __version__ as cms_version
12
from django.conf import settings
23
from django.db import models
34

4-
from cms import __version__ as cms_version
5-
6-
75
if cms_version < "4":
86
class Version(models.Model):
97
content = models.ForeignKey("djangocms_snippet.Snippet", related_name="versions", on_delete=models.CASCADE)

0 commit comments

Comments
 (0)