Skip to content

Commit eb9f3a1

Browse files
committed
Formatting
1 parent cfea041 commit eb9f3a1

57 files changed

Lines changed: 128 additions & 72 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config/urls.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
from django.urls import include, path, register_converter
55
from django.views.decorators.cache import never_cache
66
from django.views.generic import RedirectView
7+
from wagtail import urls as wagtail_urls
8+
from wagtail.admin import urls as wagtailadmin_urls
9+
from wagtail.documents import urls as wagtaildocs_urls
10+
from wagtail.utils.urlpatterns import decorate_urlpatterns
11+
712
from etna.api.urls import api_router
813
from etna.core.cache_control import (
914
apply_default_cache_control,
@@ -14,10 +19,6 @@
1419
from etna.records import converters
1520
from etna.records import views as records_views
1621
from etna.search import views as search_views
17-
from wagtail import urls as wagtail_urls
18-
from wagtail.admin import urls as wagtailadmin_urls
19-
from wagtail.documents import urls as wagtaildocs_urls
20-
from wagtail.utils.urlpatterns import decorate_urlpatterns
2122

2223
register_converter(converters.ReferenceNumberConverter, "reference_number")
2324
register_converter(converters.IDConverter, "id")

etna/articles/blocks.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
from django.conf import settings
22
from django.utils.html import format_html
3+
from wagtail import blocks
4+
from wagtail.snippets.blocks import SnippetChooserBlock
5+
36
from etna.core.blocks import (
47
CodeBlock,
58
ContentImageBlock,
@@ -11,8 +14,6 @@
1114
)
1215
from etna.core.blocks.image import APIImageChooserBlock
1316
from etna.core.blocks.paragraph import APIRichTextBlock
14-
from wagtail import blocks
15-
from wagtail.snippets.blocks import SnippetChooserBlock
1617

1718
from ..records.blocks import RecordLinksBlock
1819

etna/articles/factories.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import factory
2+
from wagtail_factories import ImageFactory
3+
24
from etna.articles import models as app_models
35
from etna.core.factories import BasePageFactory
4-
from wagtail_factories import ImageFactory
56

67

78
class ArticlePageFactory(BasePageFactory):

etna/articles/migrations/0001_initial.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import uuid
44

55
import django.db.models.deletion
6-
import etna.analytics.mixins
7-
import etna.records.blocks
86
import modelcluster.contrib.taggit
97
import modelcluster.fields
108
import wagtail.blocks
@@ -14,6 +12,9 @@
1412
import wagtailmetadata.models
1513
from django.db import migrations, models
1614

15+
import etna.analytics.mixins
16+
import etna.records.blocks
17+
1718

1819
class Migration(migrations.Migration):
1920
initial = True

etna/articles/migrations/0002_alter_articlepage_body.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
# Generated by Django 5.0.2 on 2024-03-13 14:08
22
# etna:allowAlterField
33

4-
import etna.core.blocks.paragraph
5-
import etna.records.blocks
64
import wagtail.blocks
75
import wagtail.fields
86
import wagtail.images.blocks
97
import wagtail.snippets.blocks
108
from django.db import migrations
119

10+
import etna.core.blocks.paragraph
11+
import etna.records.blocks
12+
1213

1314
class Migration(migrations.Migration):
1415

etna/articles/migrations/0003_alter_articlepage_body.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
# Generated by Django 5.0.3 on 2024-04-09 12:22
22
# etna:allowAlterField
33

4-
import etna.core.blocks.image
5-
import etna.core.blocks.paragraph
6-
import etna.records.blocks
74
import wagtail.blocks
85
import wagtail.fields
96
import wagtail.snippets.blocks
107
from django.db import migrations
118

9+
import etna.core.blocks.image
10+
import etna.core.blocks.paragraph
11+
import etna.records.blocks
12+
1213

1314
class Migration(migrations.Migration):
1415

etna/articles/migrations/0004_alter_articlepage_body.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
# Generated by Django 5.0.4 on 2024-09-03 09:32
22
# etna:allowAlterField
33

4-
import etna.core.blocks.image
5-
import etna.core.blocks.paragraph
6-
import etna.records.blocks
74
import wagtail.blocks
85
import wagtail.fields
96
import wagtail.snippets.blocks
107
from django.db import migrations
118

9+
import etna.core.blocks.image
10+
import etna.core.blocks.paragraph
11+
import etna.records.blocks
12+
1213

1314
class Migration(migrations.Migration):
1415

etna/articles/models.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
from django.utils.functional import cached_property
66
from django.utils.safestring import mark_safe
77
from django.utils.translation import gettext_lazy as _
8-
from etna.core.models import (
9-
BasePageWithIntro,
10-
ContentWarningMixin,
11-
HeroImageMixin,
12-
NewLabelMixin,
13-
)
14-
from etna.core.utils import skos_id_from_text
158
from modelcluster.contrib.taggit import ClusterTaggableManager
169
from modelcluster.fields import ParentalKey
1710
from rest_framework import serializers
@@ -24,6 +17,14 @@
2417
from wagtail.search import index
2518
from wagtail.snippets.models import register_snippet
2619

20+
from etna.core.models import (
21+
BasePageWithIntro,
22+
ContentWarningMixin,
23+
HeroImageMixin,
24+
NewLabelMixin,
25+
)
26+
from etna.core.utils import skos_id_from_text
27+
2728
from .blocks import ArticlePageStreamBlock
2829

2930

etna/categories/migrations/0001_initial.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Generated by Django 4.2.7 on 2023-11-23 19:43
22

3-
import etna.categories.models
43
from django.db import migrations, models
54

5+
import etna.categories.models
6+
67

78
class Migration(migrations.Migration):
89
initial = True

etna/ciim/client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import requests
1919
from django.utils.functional import cached_property
2020
from django.utils.timezone import get_current_timezone
21+
2122
from etna.ciim.constants import Aggregation, BucketKeys, VisViews
2223
from etna.records.models import Record
2324

0 commit comments

Comments
 (0)