Bump ruff to latest and fix code

Author: DanielNoord

isort/identify.py

@@ -159,7 +159,7 @@ def imports(
 
                 from_import = parts[0].split(" ")
                 import_string = (" cimport " if cimports else " import ").join(
-                    [from_import[0] + " " + "".join(from_import[1:])] + parts[1:]
+                    [from_import[0] + " " + "".join(from_import[1:]), *parts[1:]]
                 )
 
             just_imports = [

isort/main.py

@@ -1193,7 +1193,7 @@ def main(argv: Optional[Sequence[str]] = None, stdin: Optional[TextIOWrapper] =
             print(ASCII_ART)
 
         if jobs:
-            import multiprocessing
+            import multiprocessing  # noqa: PLC0415
 
             executor = multiprocessing.Pool(jobs if jobs > 0 else multiprocessing.cpu_count())
             attempt_iterator = executor.imap(

isort/parse.py

@@ -151,7 +151,7 @@ def file_contents(contents: str, config: Config = DEFAULT_CONFIG) -> ParsedConte
     out_lines = []
     original_line_count = len(in_lines)
     if config.old_finders:
-        from .deprecated.finders import FindersManager
+        from .deprecated.finders import FindersManager  # noqa: PLC0415
 
         finder = FindersManager(config=config).find
     else:
@@ -372,7 +372,7 @@ def file_contents(contents: str, config: Config = DEFAULT_CONFIG) -> ParsedConte
 
                 from_import = parts[0].split(" ")
                 import_string = (" cimport " if cimports else " import ").join(
-                    [from_import[0] + " " + "".join(from_import[1:])] + parts[1:]
+                    [from_import[0] + " " + "".join(from_import[1:]), *parts[1:]]
                 )
 
             just_imports = [

isort/settings.py

@@ -931,9 +931,9 @@ def entry_points(group: str) -> "EntryPoints":
     TODO: The reason for lazy loading here are unknown.
     """
     if sys.version_info < (3, 10):  # pragma: no cover
-        from importlib_metadata import entry_points as ep
+        from importlib_metadata import entry_points as ep  # noqa: PLC0415
     else:
-        from importlib.metadata import entry_points as ep
+        from importlib.metadata import entry_points as ep  # noqa: PLC0415
 
     return ep(group=group)
 

pyproject.toml

@@ -138,7 +138,7 @@ dev = [
     "portray>=1.8.0",
     "pytest>=8.4.2",
     "pytest-benchmark>=5.1.0",
-    "ruff>=0.9.6",
+    "ruff>=0.13.3",
     "setuptools>=75.8.0",
     "stdlibs>=2024.10.21.16",
     "toml>=0.10.2",
@@ -203,6 +203,7 @@ lint.ignore = [
     "B904",
     "E501",
     "PERF203",
+    "PT030", # Too much work to turn on for now
     "RUF100",
 ]
 lint.exclude = [ "isort/_vendored/*" ]

tests/unit/test_importable.py

@@ -1,5 +1,7 @@
 """Basic set of tests to ensure entire code base is importable"""
 
+# ruff: noqa: PLC0415
+
 import pytest
 
 

tests/unit/test_isort.py

@@ -20,6 +20,8 @@
 from isort.exceptions import ExistingSyntaxErrors, FileSkipped, MissingSection
 from isort.settings import Config
 from isort.utils import exists_case_sensitive
+from isort.main import parse_args
+from isort.main import main
 
 from .utils import UnreadableStream, as_stream
 
@@ -3762,12 +3764,10 @@ def test_monkey_patched_urllib() -> None:
     with pytest.raises(ImportError):
         # Previous versions of isort monkey patched urllib which caused unusual
         # importing for other projects.
-        from urllib import quote  # type: ignore  # noqa: F401
+        from urllib import quote  # type: ignore  # noqa: F401, PLC0415
 
 
 def test_argument_parsing() -> None:
-    from isort.main import parse_args
-
     args = parse_args(["--dt", "-t", "foo", "--skip=bar", "baz.py", "--os"])
     assert args["order_by_type"] is False
     assert args["force_to_top"] == ["foo"]
@@ -3778,8 +3778,6 @@ def test_argument_parsing() -> None:
 
 @pytest.mark.parametrize("multiprocess", [False, True])
 def test_command_line(tmpdir, capfd, multiprocess: bool) -> None:
-    from isort.main import main
-
     tmpdir.join("file1.py").write("import re\nimport os\n\nimport contextlib\n\n\nimport isort")
     tmpdir.join("file2.py").write(
         "import collections\nimport time\n\nimport abc" "\n\n\nimport isort"
@@ -3808,7 +3806,6 @@ def test_command_line(tmpdir, capfd, multiprocess: bool) -> None:
 def test_quiet(tmpdir, capfd, quiet: bool) -> None:
     if sys.platform.startswith("win"):
         return
-    from isort.main import main
 
     tmpdir.join("file1.py").write("import re\nimport os")
     tmpdir.join("file2.py").write("")
@@ -4602,8 +4599,6 @@ def test_move_class_issue_751() -> None:
 
 
 def test_python_version() -> None:
-    from isort.main import parse_args
-
     # test that the py_version can be added as flag
     args = parse_args(["--py=27"])
     assert args["py_version"] == "27"

tests/unit/test_literal.py

@@ -15,7 +15,7 @@ def test_invalid_syntax():
 
 
 def test_invalid_sort_type():
-    with pytest.raises(ValueError, match="Trying to sort using an undefined sort_type. Defined"):
+    with pytest.raises(ValueError, match=r"Trying to sort using an undefined sort_type. Defined"):
         isort.literal.assignment("x = [1, 2, 3", "tuple-list-not-exist", "py")
 
 

tests/unit/test_main.py

@@ -66,7 +66,7 @@ def test_sort_imports_error_handling(tmpdir, capsys):
     ):
         main.sort_imports(str(tmp_file), DEFAULT_CONFIG, check=True).incorrectly_sorted  # type: ignore # noqa
 
-    out, error = capsys.readouterr()
+    _, error = capsys.readouterr()
     assert "Unrecoverable exception thrown when parsing" in error
 
 
@@ -189,16 +189,19 @@ def test_main(capsys, tmpdir):
     assert returned_config["virtual_env"] == str(tmpdir)
 
     # This should work even if settings path is not provided
-    main.main(base_args[2:] + ["--show-config"])
+    main.main([*base_args[2:], "--show-config"])
     out, error = capsys.readouterr()
     assert json.loads(out)["virtual_env"] == str(tmpdir)
 
     # This should raise an error if an invalid settings path is provided
     with pytest.raises(InvalidSettingsPath):
         main.main(
-            base_args[2:]
-            + ["--show-config"]
-            + ["--settings-path", "/random-root-folder-that-cant-exist-right?"]
+            [
+                *base_args[2:],
+                "--show-config",
+                "--settings-path",
+                "/random-root-folder-that-cant-exist-right?",
+            ]
         )
 
     # Should be able to set settings path to a file
@@ -894,7 +897,7 @@ def test_unsupported_encodings(tmpdir, capsys):
     # should throw an error if only unsupported encoding provided
     with pytest.raises(SystemExit):
         main.main([str(tmp_file)])
-    out, error = capsys.readouterr()
+    _, error = capsys.readouterr()
 
     assert "No valid encodings." in error
 
@@ -903,7 +906,7 @@ def test_unsupported_encodings(tmpdir, capsys):
     normal_file.write("import os\nimport sys")
 
     main.main([str(tmp_file), str(normal_file), "--verbose"])
-    out, error = capsys.readouterr()
+    _, error = capsys.readouterr()
 
 
 def test_stream_skip_file(tmpdir, capsys):
@@ -914,13 +917,13 @@ def test_stream_skip_file(tmpdir, capsys):
 """
     stream_with_skip = as_stream(input_with_skip)
     main.main(["-"], stdin=stream_with_skip)
-    out, error = capsys.readouterr()
+    out, _ = capsys.readouterr()
     assert out == input_with_skip
 
     input_without_skip = input_with_skip.replace("isort: skip_file", "generic comment")
     stream_without_skip = as_stream(input_without_skip)
     main.main(["-"], stdin=stream_without_skip)
-    out, error = capsys.readouterr()
+    out, _ = capsys.readouterr()
     assert (
         out
         == """
@@ -933,7 +936,7 @@ def test_stream_skip_file(tmpdir, capsys):
     atomic_input_without_skip = input_with_skip.replace("isort: skip_file", "generic comment")
     stream_without_skip = as_stream(atomic_input_without_skip)
     main.main(["-", "--atomic"], stdin=stream_without_skip)
-    out, error = capsys.readouterr()
+    out, _ = capsys.readouterr()
     assert (
         out
         == """

tests/unit/test_settings.py

@@ -34,7 +34,7 @@ def test_invalid_settings_path(self):
             Config(settings_path="this_couldnt_possibly_actually_exists/could_it")
 
     def test_invalid_pyversion(self):
-        with pytest.raises(ValueError, match="The python version 10 is not supported."):
+        with pytest.raises(ValueError, match=r"The python version 10 is not supported."):
             Config(py_version=10)
 
     def test_invalid_profile(self):