diff --git a/pyproject.toml b/pyproject.toml index a99e90e9f..05b01afec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -203,10 +203,14 @@ line-length = 100 [tool.ruff.lint] ignore = ["E501"] extend-select = [ + "I", # https://docs.astral.sh/ruff/rules/#isort-i "FA", # https://docs.astral.sh/ruff/rules/#flake8-future-annotations-fa "UP", # https://docs.astral.sh/ruff/rules/#pyupgrade-up "RUF100", # https://docs.astral.sh/ruff/rules/#ruff-specific-rules-ruf ] +[tool.ruff.lint.isort] +extra-standard-library = ["tomllib"] + [tool.bandit] exclude_dirs = ["tests", 'examples/*/_tests.py', "conftest.py"] diff --git a/tests/test_only.py b/tests/test_only.py index dbfdb0582..2a5eb6e28 100644 --- a/tests/test_only.py +++ b/tests/test_only.py @@ -1,7 +1,7 @@ from tests.testmodels import DoubleFK, Event, SourceFields, StraightFields, Tournament from tortoise.contrib import test -from tortoise.functions import Count from tortoise.exceptions import FieldError, IncompleteInstanceError +from tortoise.functions import Count class TestOnlyStraight(test.TestCase): diff --git a/tortoise/contrib/mysql/json_functions.py b/tortoise/contrib/mysql/json_functions.py index 4bc00022c..d9d6e1fc3 100644 --- a/tortoise/contrib/mysql/json_functions.py +++ b/tortoise/contrib/mysql/json_functions.py @@ -5,9 +5,8 @@ from typing import Any from pypika_tortoise.functions import Cast -from pypika_tortoise.terms import Criterion +from pypika_tortoise.terms import Criterion, Term, ValueWrapper from pypika_tortoise.terms import Function as PypikaFunction -from pypika_tortoise.terms import Term, ValueWrapper from tortoise.filters import not_equal from tortoise.query_utils import get_json_filter_operator diff --git a/tortoise/contrib/mysql/search.py b/tortoise/contrib/mysql/search.py index 6d680d9a1..3307eb2a3 100644 --- a/tortoise/contrib/mysql/search.py +++ b/tortoise/contrib/mysql/search.py @@ -5,9 +5,8 @@ from pypika_tortoise import SqlContext from pypika_tortoise.enums import Comparator -from pypika_tortoise.terms import BasicCriterion +from pypika_tortoise.terms import BasicCriterion, Term from pypika_tortoise.terms import Function as PypikaFunction -from pypika_tortoise.terms import Term class Comp(Comparator): diff --git a/tortoise/expressions.py b/tortoise/expressions.py index c16e719de..48f7be555 100644 --- a/tortoise/expressions.py +++ b/tortoise/expressions.py @@ -14,12 +14,10 @@ from pypika_tortoise.terms import ( ArithmeticExpression, Criterion, -) -from pypika_tortoise.terms import Function as PypikaFunction -from pypika_tortoise.terms import ( Term, ValueWrapper, ) +from pypika_tortoise.terms import Function as PypikaFunction from pypika_tortoise.utils import format_alias_sql from tortoise.exceptions import FieldError, OperationalError