mirror of https://github.com/apache/superset.git
chore: enable ruff's isort equivalent (#28267)
This commit is contained in:
parent
fe37d914e5
commit
3ac387bb66
|
@ -424,6 +424,7 @@ exclude = [
|
||||||
"venv",
|
"venv",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
# Same as Black.
|
# Same as Black.
|
||||||
line-length = 88
|
line-length = 88
|
||||||
indent-width = 4
|
indent-width = 4
|
||||||
|
@ -438,6 +439,8 @@ target-version = "py310"
|
||||||
select = ["E4", "E7", "E9", "F"]
|
select = ["E4", "E7", "E9", "F"]
|
||||||
ignore = []
|
ignore = []
|
||||||
|
|
||||||
|
extend-select = ["I"]
|
||||||
|
|
||||||
# Allow fix for all enabled rules (when `--fix`) is provided.
|
# Allow fix for all enabled rules (when `--fix`) is provided.
|
||||||
fixable = ["ALL"]
|
fixable = ["ALL"]
|
||||||
unfixable = []
|
unfixable = []
|
||||||
|
@ -445,6 +448,22 @@ unfixable = []
|
||||||
# Allow unused variables when underscore-prefixed.
|
# Allow unused variables when underscore-prefixed.
|
||||||
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
|
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
|
||||||
|
|
||||||
|
[tool.ruff.lint.isort]
|
||||||
|
case-sensitive = false
|
||||||
|
combine-as-imports = true
|
||||||
|
force-sort-within-sections = false
|
||||||
|
known-first-party = []
|
||||||
|
known-third-party = []
|
||||||
|
lines-after-imports = -1
|
||||||
|
order-by-type = false
|
||||||
|
section-order = [
|
||||||
|
"future",
|
||||||
|
"standard-library",
|
||||||
|
"third-party",
|
||||||
|
"first-party",
|
||||||
|
"local-folder"
|
||||||
|
]
|
||||||
|
|
||||||
[tool.ruff.format]
|
[tool.ruff.format]
|
||||||
# Like Black, use double quotes for strings.
|
# Like Black, use double quotes for strings.
|
||||||
quote-style = "double"
|
quote-style = "double"
|
||||||
|
|
|
@ -21,7 +21,7 @@ from typing import Any, Literal, Optional
|
||||||
|
|
||||||
import jwt
|
import jwt
|
||||||
import redis
|
import redis
|
||||||
from flask import Flask, request, Request, Response, session
|
from flask import Flask, Request, request, Response, session
|
||||||
|
|
||||||
from superset.utils.core import get_user_id
|
from superset.utils.core import get_user_id
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,14 @@ down_revision = "bddc498dd179"
|
||||||
import json # noqa: E402
|
import json # noqa: E402
|
||||||
|
|
||||||
from alembic import op # noqa: E402
|
from alembic import op # noqa: E402
|
||||||
from sqlalchemy import Column, create_engine, ForeignKey, Integer, String, Text # noqa: E402
|
from sqlalchemy import ( # noqa: E402
|
||||||
|
Column,
|
||||||
|
create_engine,
|
||||||
|
ForeignKey,
|
||||||
|
Integer,
|
||||||
|
String,
|
||||||
|
Text,
|
||||||
|
)
|
||||||
from sqlalchemy.ext.declarative import declarative_base # noqa: E402
|
from sqlalchemy.ext.declarative import declarative_base # noqa: E402
|
||||||
|
|
||||||
from superset import db # noqa: E402
|
from superset import db # noqa: E402
|
||||||
|
|
|
@ -32,7 +32,6 @@ from sqlalchemy.dialects.mysql.base import MySQLDialect # noqa: E402
|
||||||
from sqlalchemy.dialects.postgresql.base import PGDialect # noqa: E402
|
from sqlalchemy.dialects.postgresql.base import PGDialect # noqa: E402
|
||||||
from sqlalchemy.dialects.sqlite.base import SQLiteDialect # noqa: E402
|
from sqlalchemy.dialects.sqlite.base import SQLiteDialect # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
report_schedule = sa.Table(
|
report_schedule = sa.Table(
|
||||||
"report_schedule",
|
"report_schedule",
|
||||||
sa.MetaData(),
|
sa.MetaData(),
|
||||||
|
|
|
@ -43,7 +43,10 @@ from sqlalchemy.sql.expression import and_, or_ # noqa: E402
|
||||||
from sqlalchemy_utils import UUIDType # noqa: E402
|
from sqlalchemy_utils import UUIDType # noqa: E402
|
||||||
|
|
||||||
from superset.connectors.sqla.models import ADDITIVE_METRIC_TYPES_LOWER # noqa: E402
|
from superset.connectors.sqla.models import ADDITIVE_METRIC_TYPES_LOWER # noqa: E402
|
||||||
from superset.connectors.sqla.utils import get_dialect_name, get_identifier_quoter # noqa: E402
|
from superset.connectors.sqla.utils import ( # noqa: E402
|
||||||
|
get_dialect_name,
|
||||||
|
get_identifier_quoter,
|
||||||
|
)
|
||||||
from superset.extensions import encrypted_field_factory # noqa: E402
|
from superset.extensions import encrypted_field_factory # noqa: E402
|
||||||
from superset.migrations.shared.utils import assign_uuids # noqa: E402
|
from superset.migrations.shared.utils import assign_uuids # noqa: E402
|
||||||
from superset.sql_parse import extract_table_references, Table # noqa: E402
|
from superset.sql_parse import extract_table_references, Table # noqa: E402
|
||||||
|
|
|
@ -25,13 +25,14 @@ Create Date: 2023-06-08 11:34:36.241939
|
||||||
from alembic import op
|
from alembic import op
|
||||||
|
|
||||||
from superset import db
|
from superset import db
|
||||||
|
from superset.migrations.shared.migrate_viz.processors import (
|
||||||
|
MigrateDualLine, # noqa: E402
|
||||||
|
)
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision = "ae58e1e58e5c"
|
revision = "ae58e1e58e5c"
|
||||||
down_revision = "4c5da39be729"
|
down_revision = "4c5da39be729"
|
||||||
|
|
||||||
from superset.migrations.shared.migrate_viz.processors import MigrateDualLine # noqa: E402
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade():
|
def upgrade():
|
||||||
bind = op.get_bind()
|
bind = op.get_bind()
|
||||||
|
|
|
@ -31,7 +31,10 @@ from alembic import op # noqa: E402
|
||||||
from sqlalchemy.ext.declarative import declarative_base # noqa: E402
|
from sqlalchemy.ext.declarative import declarative_base # noqa: E402
|
||||||
|
|
||||||
from superset import db # noqa: E402
|
from superset import db # noqa: E402
|
||||||
from superset.migrations.shared.utils import paginated_update, table_has_column # noqa: E402
|
from superset.migrations.shared.utils import ( # noqa: E402
|
||||||
|
paginated_update,
|
||||||
|
table_has_column,
|
||||||
|
)
|
||||||
|
|
||||||
Base = declarative_base()
|
Base = declarative_base()
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,6 @@ down_revision = "4b85906e5b91"
|
||||||
|
|
||||||
from importlib import import_module # noqa: E402
|
from importlib import import_module # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
module = import_module(
|
module = import_module(
|
||||||
"superset.migrations.versions.2023-09-06_13-18_317970b4400c_added_time_secondary_column_to_"
|
"superset.migrations.versions.2023-09-06_13-18_317970b4400c_added_time_secondary_column_to_"
|
||||||
)
|
)
|
||||||
|
|
|
@ -28,7 +28,6 @@ down_revision = "65a167d4c62e"
|
||||||
|
|
||||||
from importlib import import_module # noqa: E402
|
from importlib import import_module # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
module = import_module(
|
module = import_module(
|
||||||
"superset.migrations.versions.2021-03-29_11-15_3ebe0993c770_filterset_table"
|
"superset.migrations.versions.2021-03-29_11-15_3ebe0993c770_filterset_table"
|
||||||
)
|
)
|
||||||
|
|
|
@ -25,8 +25,8 @@ from inspect import (
|
||||||
isclass,
|
isclass,
|
||||||
isfunction,
|
isfunction,
|
||||||
ismethod,
|
ismethod,
|
||||||
signature,
|
|
||||||
Signature,
|
Signature,
|
||||||
|
signature,
|
||||||
)
|
)
|
||||||
from logging import Logger
|
from logging import Logger
|
||||||
from typing import Any, Callable, cast, Union
|
from typing import Any, Callable, cast, Union
|
||||||
|
|
|
@ -23,7 +23,9 @@ from flask_appbuilder.security.sqla.models import User
|
||||||
from sqlalchemy.orm import Session # noqa: F401
|
from sqlalchemy.orm import Session # noqa: F401
|
||||||
|
|
||||||
from superset import db
|
from superset import db
|
||||||
from superset.commands.dashboard.exceptions import DashboardAccessDeniedError # noqa: F401
|
from superset.commands.dashboard.exceptions import (
|
||||||
|
DashboardAccessDeniedError, # noqa: F401
|
||||||
|
)
|
||||||
from superset.commands.temporary_cache.entry import Entry
|
from superset.commands.temporary_cache.entry import Entry
|
||||||
from superset.extensions import cache_manager
|
from superset.extensions import cache_manager
|
||||||
from superset.models.dashboard import Dashboard
|
from superset.models.dashboard import Dashboard
|
||||||
|
|
|
@ -23,7 +23,9 @@ from flask_appbuilder.security.sqla.models import User # noqa: F401
|
||||||
from sqlalchemy.orm import Session # noqa: F401
|
from sqlalchemy.orm import Session # noqa: F401
|
||||||
|
|
||||||
from superset import db
|
from superset import db
|
||||||
from superset.commands.dashboard.exceptions import DashboardAccessDeniedError # noqa: F401
|
from superset.commands.dashboard.exceptions import (
|
||||||
|
DashboardAccessDeniedError, # noqa: F401
|
||||||
|
)
|
||||||
from superset.key_value.models import KeyValueEntry
|
from superset.key_value.models import KeyValueEntry
|
||||||
from superset.key_value.types import KeyValueResource
|
from superset.key_value.types import KeyValueResource
|
||||||
from superset.key_value.utils import decode_permalink_id
|
from superset.key_value.utils import decode_permalink_id
|
||||||
|
|
|
@ -45,7 +45,9 @@ from tests.integration_tests.fixtures.birth_names_dashboard import (
|
||||||
load_birth_names_dashboard_with_slices, # noqa: F401
|
load_birth_names_dashboard_with_slices, # noqa: F401
|
||||||
load_birth_names_data, # noqa: F401
|
load_birth_names_data, # noqa: F401
|
||||||
)
|
)
|
||||||
from tests.integration_tests.fixtures.public_role import public_role_like_gamma # noqa: F401
|
from tests.integration_tests.fixtures.public_role import (
|
||||||
|
public_role_like_gamma, # noqa: F401
|
||||||
|
)
|
||||||
from tests.integration_tests.fixtures.query_context import get_query_context
|
from tests.integration_tests.fixtures.query_context import get_query_context
|
||||||
from tests.integration_tests.fixtures.world_bank_dashboard import (
|
from tests.integration_tests.fixtures.world_bank_dashboard import (
|
||||||
load_world_bank_dashboard_with_slices, # noqa: F401
|
load_world_bank_dashboard_with_slices, # noqa: F401
|
||||||
|
|
|
@ -46,7 +46,10 @@ from superset.utils.core import backend, get_example_default_schema
|
||||||
from superset.utils.database import get_example_database, get_main_database
|
from superset.utils.database import get_example_database, get_main_database
|
||||||
from superset.utils.dict_import_export import export_to_dict
|
from superset.utils.dict_import_export import export_to_dict
|
||||||
from tests.integration_tests.base_tests import SupersetTestCase
|
from tests.integration_tests.base_tests import SupersetTestCase
|
||||||
from tests.integration_tests.conftest import CTAS_SCHEMA_NAME, with_feature_flags # noqa: F401
|
from tests.integration_tests.conftest import ( # noqa: F401
|
||||||
|
CTAS_SCHEMA_NAME,
|
||||||
|
with_feature_flags,
|
||||||
|
)
|
||||||
from tests.integration_tests.constants import (
|
from tests.integration_tests.constants import (
|
||||||
ADMIN_USERNAME,
|
ADMIN_USERNAME,
|
||||||
ALPHA_USERNAME,
|
ALPHA_USERNAME,
|
||||||
|
|
|
@ -27,13 +27,20 @@ import pytest
|
||||||
from superset import app, db
|
from superset import app, db
|
||||||
from superset.commands.dataset.exceptions import DatasetNotFoundError
|
from superset.commands.dataset.exceptions import DatasetNotFoundError
|
||||||
from superset.common.utils.query_cache_manager import QueryCacheManager
|
from superset.common.utils.query_cache_manager import QueryCacheManager
|
||||||
from superset.connectors.sqla.models import SqlaTable, SqlMetric, TableColumn # noqa: F401
|
from superset.connectors.sqla.models import ( # noqa: F401
|
||||||
|
SqlaTable,
|
||||||
|
SqlMetric,
|
||||||
|
TableColumn,
|
||||||
|
)
|
||||||
from superset.constants import CacheRegion
|
from superset.constants import CacheRegion
|
||||||
from superset.daos.exceptions import DatasourceNotFound, DatasourceTypeNotSupportedError
|
from superset.daos.exceptions import DatasourceNotFound, DatasourceTypeNotSupportedError
|
||||||
from superset.exceptions import SupersetGenericDBErrorException
|
from superset.exceptions import SupersetGenericDBErrorException
|
||||||
from superset.models.core import Database
|
from superset.models.core import Database
|
||||||
from superset.utils.core import backend, get_example_default_schema # noqa: F401
|
from superset.utils.core import backend, get_example_default_schema # noqa: F401
|
||||||
from superset.utils.database import get_example_database, get_main_database # noqa: F401
|
from superset.utils.database import ( # noqa: F401
|
||||||
|
get_example_database,
|
||||||
|
get_main_database,
|
||||||
|
)
|
||||||
from tests.integration_tests.base_tests import db_insert_temp_object, SupersetTestCase
|
from tests.integration_tests.base_tests import db_insert_temp_object, SupersetTestCase
|
||||||
from tests.integration_tests.constants import ADMIN_USERNAME
|
from tests.integration_tests.constants import ADMIN_USERNAME
|
||||||
from tests.integration_tests.fixtures.birth_names_dashboard import (
|
from tests.integration_tests.fixtures.birth_names_dashboard import (
|
||||||
|
|
|
@ -19,8 +19,14 @@ from .birth_names_dashboard import (
|
||||||
load_birth_names_dashboard_with_slices, # noqa: F401
|
load_birth_names_dashboard_with_slices, # noqa: F401
|
||||||
load_birth_names_dashboard_with_slices_module_scope, # noqa: F401
|
load_birth_names_dashboard_with_slices_module_scope, # noqa: F401
|
||||||
)
|
)
|
||||||
from .energy_dashboard import load_energy_table_data, load_energy_table_with_slice # noqa: F401
|
from .energy_dashboard import ( # noqa: F401
|
||||||
from .public_role import public_role_like_gamma, public_role_like_test_role # noqa: F401
|
load_energy_table_data,
|
||||||
|
load_energy_table_with_slice,
|
||||||
|
)
|
||||||
|
from .public_role import ( # noqa: F401
|
||||||
|
public_role_like_gamma,
|
||||||
|
public_role_like_test_role,
|
||||||
|
)
|
||||||
from .unicode_dashboard import (
|
from .unicode_dashboard import (
|
||||||
load_unicode_dashboard_with_position, # noqa: F401
|
load_unicode_dashboard_with_position, # noqa: F401
|
||||||
load_unicode_dashboard_with_slice, # noqa: F401
|
load_unicode_dashboard_with_slice, # noqa: F401
|
||||||
|
|
|
@ -26,7 +26,9 @@ from superset.reports.models import (
|
||||||
ReportRecipientType,
|
ReportRecipientType,
|
||||||
ReportScheduleType,
|
ReportScheduleType,
|
||||||
)
|
)
|
||||||
from tests.integration_tests.fixtures.tabbed_dashboard import tabbed_dashboard # noqa: F401
|
from tests.integration_tests.fixtures.tabbed_dashboard import (
|
||||||
|
tabbed_dashboard, # noqa: F401
|
||||||
|
)
|
||||||
|
|
||||||
DASHBOARD_REPORT_SCHEDULE_DEFAULTS = {
|
DASHBOARD_REPORT_SCHEDULE_DEFAULTS = {
|
||||||
"type": ReportScheduleType.REPORT,
|
"type": ReportScheduleType.REPORT,
|
||||||
|
|
|
@ -24,7 +24,9 @@ from superset.commands.dashboard.permalink.create import CreateDashboardPermalin
|
||||||
from superset.commands.report.execute import AsyncExecuteReportScheduleCommand
|
from superset.commands.report.execute import AsyncExecuteReportScheduleCommand
|
||||||
from superset.models.dashboard import Dashboard
|
from superset.models.dashboard import Dashboard
|
||||||
from superset.reports.models import ReportSourceFormat
|
from superset.reports.models import ReportSourceFormat
|
||||||
from tests.integration_tests.fixtures.tabbed_dashboard import tabbed_dashboard # noqa: F401
|
from tests.integration_tests.fixtures.tabbed_dashboard import (
|
||||||
|
tabbed_dashboard, # noqa: F401
|
||||||
|
)
|
||||||
from tests.integration_tests.reports.utils import create_dashboard_report
|
from tests.integration_tests.reports.utils import create_dashboard_report
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,9 @@ from superset.utils.core import DatasourceType
|
||||||
from superset.utils.database import get_main_database
|
from superset.utils.database import get_main_database
|
||||||
from tests.integration_tests.base_tests import SupersetTestCase
|
from tests.integration_tests.base_tests import SupersetTestCase
|
||||||
from tests.integration_tests.conftest import with_feature_flags
|
from tests.integration_tests.conftest import with_feature_flags
|
||||||
from tests.integration_tests.fixtures.tags import with_tagging_system_feature # noqa: F401
|
from tests.integration_tests.fixtures.tags import (
|
||||||
|
with_tagging_system_feature, # noqa: F401
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestTagging(SupersetTestCase):
|
class TestTagging(SupersetTestCase):
|
||||||
|
|
|
@ -48,7 +48,9 @@ from tests.integration_tests.fixtures.importexport import (
|
||||||
dataset_config, # noqa: F401
|
dataset_config, # noqa: F401
|
||||||
dataset_metadata_config, # noqa: F401
|
dataset_metadata_config, # noqa: F401
|
||||||
)
|
)
|
||||||
from tests.integration_tests.fixtures.tags import with_tagging_system_feature # noqa: F401
|
from tests.integration_tests.fixtures.tags import (
|
||||||
|
with_tagging_system_feature, # noqa: F401
|
||||||
|
)
|
||||||
from tests.integration_tests.fixtures.world_bank_dashboard import (
|
from tests.integration_tests.fixtures.world_bank_dashboard import (
|
||||||
load_world_bank_dashboard_with_slices, # noqa: F401
|
load_world_bank_dashboard_with_slices, # noqa: F401
|
||||||
load_world_bank_data, # noqa: F401
|
load_world_bank_data, # noqa: F401
|
||||||
|
|
|
@ -32,7 +32,9 @@ from tests.integration_tests.fixtures.birth_names_dashboard import (
|
||||||
load_birth_names_data, # noqa: F401
|
load_birth_names_data, # noqa: F401
|
||||||
)
|
)
|
||||||
from tests.integration_tests.fixtures.query_context import get_query_context
|
from tests.integration_tests.fixtures.query_context import get_query_context
|
||||||
from tests.integration_tests.fixtures.tags import with_tagging_system_feature # noqa: F401
|
from tests.integration_tests.fixtures.tags import (
|
||||||
|
with_tagging_system_feature, # noqa: F401
|
||||||
|
)
|
||||||
from tests.integration_tests.test_app import app
|
from tests.integration_tests.test_app import app
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
|
|
||||||
from superset.commands.utils import compute_owner_list, populate_owner_list, User
|
from superset.commands.utils import compute_owner_list, populate_owner_list, User
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue