refactor: divide views by file, black, isort,ruff

ckanext/tour/col_renderers.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from ckanext.toolbelt.decorators import Collector
-
 import ckanext.admin_panel.types as ap_types
+from ckanext.toolbelt.decorators import Collector
 
 renderer, get_renderers = Collector("tour").split()
 

ckanext/tour/logic/action.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from typing import Any, cast
 from datetime import datetime as dt
+from typing import Any, cast
 
 import ckan.model as model
 import ckan.plugins.toolkit as tk

ckanext/tour/logic/schema.py

@@ -4,7 +4,7 @@
 
 from ckan.logic.schema import validator_args
 
-from ckanext.tour.model import TourStep, Tour
+from ckanext.tour.model import Tour, TourStep
 
 Schema = Dict[str, Any]
 

ckanext/tour/migration/tour/env.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import with_statement
-from alembic import context
-from sqlalchemy import engine_from_config, pool
-from logging.config import fileConfig
 
 import os
+from logging.config import fileConfig
+
+from alembic import context
+from sqlalchemy import engine_from_config, pool
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

ckanext/tour/migration/tour/versions/c9e5d4235e58_create_tour_tourstep_tourstepimage_.py

@@ -5,9 +5,8 @@
 Create Date: 2023-07-23 13:20:58.129326
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "c9e5d4235e58"

ckanext/tour/model.py

@@ -4,13 +4,12 @@
 from datetime import datetime
 from typing import Any
 
-from sqlalchemy import Column, DateTime, ForeignKey, Text
-from sqlalchemy.orm import Query, relationship
-from typing_extensions import Self
-
 from ckan import model
 from ckan.model.types import make_uuid
 from ckan.plugins import toolkit as tk
+from sqlalchemy import Column, DateTime, ForeignKey, Text
+from sqlalchemy.orm import Query, relationship
+from typing_extensions import Self
 
 from ckanext.tour.exception import TourStepFileError
 

ckanext/tour/plugin.py

@@ -4,8 +4,8 @@
 import ckan.plugins.toolkit as tk
 
 from ckanext.admin_panel.interfaces import IAdminPanel
-from ckanext.admin_panel.types import SectionConfig, ConfigurationItem, ColRenderer
-
+from ckanext.admin_panel.types import (ColRenderer, ConfigurationItem,
+                                       SectionConfig)
 from ckanext.tour.col_renderers import get_renderers
 
 

ckanext/tour/templates/tour/tour_404.html

@@ -1,4 +1,4 @@
-{% extends 'tour/base.html' %}
+{% extends 'admin_panel/base.html' %}
 
 {% import 'macros/form.html' as form %}
 

ckanext/tour/templates/tour/tour_add.html

@@ -1,4 +1,4 @@
-{% extends 'tour/base.html' %}
+{% extends 'admin_panel/base.html' %}
 
 {% import 'macros/form.html' as form %}
 

ckanext/tour/templates/tour/tour_delete.html

@@ -1,4 +1,4 @@
-{% extends 'tour/base.html' %}
+{% extends 'admin_panel/base.html' %}
 
 {% import 'macros/form.html' as form %}
 

ckanext/tour/templates/tour/tour_edit.html

@@ -1,4 +1,4 @@
-{% extends 'tour/base.html' %}
+{% extends 'admin_panel/base.html' %}
 
 {% import 'macros/form.html' as form %}
 

ckanext/tour/templates/tour/tour_list.html

@@ -1,4 +1,4 @@
-{% extends 'tour/base.html' %}
+{% extends 'admin_panel/base.html' %}
 
 {% import 'macros/autoform.html' as autoform %}
 {% import 'macros/form.html' as form %}

ckanext/tour/tests/conftest.py

@@ -1,11 +1,10 @@
 from io import BytesIO
 
 import pytest
-from faker import Faker
-from pytest_factoryboy import register
-
 from ckan.lib import uploader
 from ckan.tests import factories
+from faker import Faker
+from pytest_factoryboy import register
 
 import ckanext.tour.tests.factories as tour_factories
 from ckanext.tour.tests.helpers import CSV_DATA, FakeFileStorage

ckanext/tour/tests/factories.py

@@ -1,7 +1,6 @@
 from io import BytesIO
 
 import factory
-
 from ckan.tests import factories
 
 from ckanext.tour import model as tour_model

ckanext/tour/tests/logic/test_action.py

@@ -1,7 +1,5 @@
-from turtle import position
-import pytest
-
 import ckan.plugins.toolkit as tk
+import pytest
 from ckan.tests.helpers import call_action
 
 import ckanext.tour.model as tour_model
@@ -60,9 +58,7 @@ def test_upload_multiple_image(
                 tour_id=tour["id"], image=[tour_image_data(), tour_image_data()]
             )
 
-    def test_missing_element(
-        self, tour_factory, tour_step_factory, tour_image_data
-    ):
+    def test_missing_element(self, tour_factory, tour_step_factory, tour_image_data):
         tour = tour_factory(steps=[])
 
         with pytest.raises(tk.ValidationError, match="Missing value"):