Enable import sorting Ruff rule

Hasnep · Hasnep · commit 725d18b7c476 · 2025-11-10T12:37:56.000+08:00
diff --git a/benchmarks/bench_encodings.py b/benchmarks/bench_encodings.py
@@ -1,16 +1,16 @@
 from __future__ import annotations
 
-import sys
 import dataclasses
+import importlib.metadata
 import json
+import sys
 import timeit
-import importlib.metadata
-from typing import Any, Literal, Callable
-
-from .generate_data import make_filesystem_data
+from typing import Any, Callable, Literal
 
 import msgspec
 
+from .generate_data import make_filesystem_data
+
 
 class File(msgspec.Struct, kw_only=True, omit_defaults=True, tag="file"):
     name: str
@@ -61,9 +61,9 @@ def run(self, data: bytes) -> dict:
 
 def json_benchmarks():
     import orjson
-    import ujson
     import rapidjson
     import simdjson
+    import ujson
 
     simdjson_ver = importlib.metadata.version("pysimdjson")
 
diff --git a/benchmarks/bench_structs.py b/benchmarks/bench_structs.py
@@ -217,8 +217,8 @@ def main():
     args = parser.parse_args()
 
     if args.versions:
-        import sys
         import importlib.metadata
+        import sys
 
         for _, lib, _ in BENCHMARKS:
             if lib is not None:
diff --git a/benchmarks/bench_validation/__main__.py b/benchmarks/bench_validation/__main__.py
@@ -1,11 +1,11 @@
 import argparse
 import json
-import tempfile
-from ..generate_data import make_filesystem_data
-import sys
-import subprocess
 import shutil
+import subprocess
+import sys
+import tempfile
 
+from ..generate_data import make_filesystem_data
 
 LIBRARIES = ["msgspec", "mashumaro", "cattrs", "pydantic"]
 
diff --git a/benchmarks/bench_validation/bench_cattrs.py b/benchmarks/bench_validation/bench_cattrs.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import enum
 import datetime
+import enum
 from typing import Literal
 
 import attrs
diff --git a/benchmarks/bench_validation/bench_mashumaro.py b/benchmarks/bench_validation/bench_mashumaro.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-import enum
 import dataclasses
 import datetime
+import enum
 from typing import Literal
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
diff --git a/benchmarks/bench_validation/bench_msgspec.py b/benchmarks/bench_validation/bench_msgspec.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import enum
 import datetime
+import enum
 
 import msgspec
 
diff --git a/benchmarks/bench_validation/bench_pydantic.py b/benchmarks/bench_validation/bench_pydantic.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-import enum
 import datetime
-from typing import Literal, Annotated
+import enum
+from typing import Annotated, Literal
 
 import pydantic
 
diff --git a/benchmarks/bench_validation/runner.py b/benchmarks/bench_validation/runner.py
@@ -1,9 +1,9 @@
+import gc
 import importlib
 import json
-import timeit
 import resource
 import sys
-import gc
+import timeit
 
 library, path, runs, repeats = sys.argv[1:5]
 num_runs = int(runs)
diff --git a/pyproject.toml b/pyproject.toml
@@ -164,6 +164,7 @@ ignore = [
 select = [
   "E", # PEP8 Errors
   "F", # Pyflakes
+  "I", # Import sorting
   "W", # PEP8 Warnings
 ]
 
diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
-import sys
 import os
+import sys
 
 from setuptools import setup
 from setuptools.extension import Extension
diff --git a/src/msgspec/_json_schema.py b/src/msgspec/_json_schema.py
@@ -3,7 +3,7 @@
 import re
 import textwrap
 from collections.abc import Iterable
-from typing import Any, Optional, Callable
+from typing import Any, Callable, Optional
 
 from . import inspect as mi, to_builtins
 
diff --git a/src/msgspec/_utils.py b/src/msgspec/_utils.py
@@ -2,7 +2,6 @@
 import collections
 import sys
 import typing
-
 from typing import _AnnotatedAlias  # noqa: F401
 
 try:
diff --git a/src/msgspec/structs.py b/src/msgspec/structs.py
@@ -8,8 +8,8 @@
     StructConfig,
     asdict,
     astuple,
-    replace,
     force_setattr,
+    replace,
 )
 from ._utils import get_class_annotations as _get_class_annotations
 
diff --git a/src/msgspec/toml.py b/src/msgspec/toml.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime as _datetime
-from typing import TYPE_CHECKING, overload, TypeVar, Any
+from typing import TYPE_CHECKING, Any, TypeVar, overload
 
 from . import (
     DecodeError as _DecodeError,
@@ -10,7 +10,8 @@
 )
 
 if TYPE_CHECKING:
-    from typing import Callable, Optional, Type, Union, Literal
+    from typing import Callable, Literal, Optional, Type, Union
+
     from typing_extensions import Buffer
 
 
diff --git a/src/msgspec/yaml.py b/src/msgspec/yaml.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime as _datetime
-from typing import TYPE_CHECKING, overload, TypeVar, Any
+from typing import TYPE_CHECKING, Any, TypeVar, overload
 
 from . import (
     DecodeError as _DecodeError,
@@ -10,7 +10,8 @@
 )
 
 if TYPE_CHECKING:
-    from typing import Callable, Optional, Type, Union, Literal
+    from typing import Callable, Literal, Optional, Type, Union
+
     from typing_extensions import Buffer
 
 
diff --git a/tests/test_common.py b/tests/test_common.py
@@ -32,15 +32,15 @@
 )
 
 import pytest
-from utils import temp_module, max_call_depth
+from utils import max_call_depth, temp_module
 
 try:
     import attrs
 except ImportError:
     attrs = None
 
 import msgspec
-from msgspec import Meta, Struct, ValidationError, UNSET, UnsetType
+from msgspec import UNSET, Meta, Struct, UnsetType, ValidationError
 
 UTC = datetime.timezone.utc
 
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
@@ -1,7 +1,7 @@
 import datetime
 import math
 import re
-from typing import Dict, List, Union, Annotated
+from typing import Annotated, Dict, List, Union
 
 import pytest
 
diff --git a/tests/test_convert.py b/tests/test_convert.py
@@ -19,13 +19,13 @@
     NamedTuple,
     Set,
     Tuple,
-    TypeVar,
     TypedDict,
+    TypeVar,
     Union,
 )
 
 import pytest
-from utils import temp_module, max_call_depth
+from utils import max_call_depth, temp_module
 
 import msgspec
 from msgspec import Meta, Struct, ValidationError, convert, to_builtins
diff --git a/tests/test_inspect.py b/tests/test_inspect.py
@@ -33,7 +33,6 @@
 import msgspec.inspect as mi
 from msgspec import Meta
 
-
 PY312 = sys.version_info[:2] >= (3, 12)
 py312_plus = pytest.mark.skipif(not PY312, reason="3.12+ only")
 
diff --git a/tests/test_performance.py b/tests/test_performance.py
@@ -1,9 +1,9 @@
 import textwrap
 
-import msgspec
-
 from utils import temp_module
 
+import msgspec
+
 
 def test_process_large_recursive_union():
     """
diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -29,7 +29,6 @@
 import msgspec
 from msgspec import Meta
 
-
 T = TypeVar("T")
 
 
diff --git a/tests/test_struct.py b/tests/test_struct.py
@@ -8,7 +8,7 @@
 import weakref
 from contextlib import contextmanager
 from inspect import Parameter, Signature
-from typing import Any, List, Optional, Generic, TypeVar
+from typing import Any, Generic, List, Optional, TypeVar
 
 import pytest
 from utils import temp_module
diff --git a/tests/test_struct_meta.py b/tests/test_struct_meta.py
@@ -1,9 +1,10 @@
 """Tests for the exposed StructMeta metaclass."""
 
 import pytest
+
 import msgspec
 from msgspec import Struct, StructMeta
-from msgspec.structs import asdict, astuple, replace, force_setattr
+from msgspec.structs import asdict, astuple, force_setattr, replace
 
 
 def test_struct_meta_exists():
diff --git a/tests/test_to_builtins.py b/tests/test_to_builtins.py
@@ -11,7 +11,7 @@
 
 import pytest
 
-from msgspec import UNSET, Struct, UnsetType, to_builtins, defstruct
+from msgspec import UNSET, Struct, UnsetType, defstruct, to_builtins
 
 PY310 = sys.version_info[:2] >= (3, 10)
 PY311 = sys.version_info[:2] >= (3, 11)
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -4,7 +4,7 @@
 from typing import Generic, List, Optional, Set, TypeVar
 
 import pytest
-from utils import temp_module, package_not_installed
+from utils import package_not_installed, temp_module
 
 from msgspec._utils import get_class_annotations
 
diff --git a/tests/utils.py b/tests/utils.py
@@ -1,5 +1,5 @@
-import sys
 import inspect
+import sys
 import textwrap
 import types
 import uuid

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ ignore = [`
`164`	`164`	`select = [`
`165`	`165`	`"E", # PEP8 Errors`
`166`	`166`	`"F", # Pyflakes`
	`167`	`+ "I", # Import sorting`
`167`	`168`	`"W", # PEP8 Warnings`
`168`	`169`	`]`
`169`	`170`