Skip to content

Commit 9f1be49

Browse files
authored
Merge pull request #2426 from DanielNoord/lock-refresh
Update development dependencies to latest version
2 parents 036f3d0 + 59ac3d1 commit 9f1be49

File tree

15 files changed

+353
-331
lines changed

15 files changed

+353
-331
lines changed

isort/_vendored/tomli/_parser.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
{
3535
"\\b": "\u0008", # backspace
3636
"\\t": "\u0009", # tab
37-
"\\n": "\u000A", # linefeed
38-
"\\f": "\u000C", # form feed
39-
"\\r": "\u000D", # carriage return
37+
"\\n": "\u000a", # linefeed
38+
"\\f": "\u000c", # form feed
39+
"\\r": "\u000d", # carriage return
4040
'\\"': "\u0022", # quote
41-
"\\\\": "\u005C", # backslash
41+
"\\\\": "\u005c", # backslash
4242
}
4343
)
4444

isort/identify.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def imports(
159159

160160
from_import = parts[0].split(" ")
161161
import_string = (" cimport " if cimports else " import ").join(
162-
[from_import[0] + " " + "".join(from_import[1:])] + parts[1:]
162+
[from_import[0] + " " + "".join(from_import[1:]), *parts[1:]]
163163
)
164164

165165
just_imports = [

isort/literal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def register_type(
7676
"""Registers a new literal sort type."""
7777

7878
def wrap(
79-
function: Callable[[Any, ISortPrettyPrinter], str]
79+
function: Callable[[Any, ISortPrettyPrinter], str],
8080
) -> Callable[[Any, ISortPrettyPrinter], str]:
8181
type_mapping[name] = (kind, function)
8282
return function

isort/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ def main(argv: Optional[Sequence[str]] = None, stdin: Optional[TextIOWrapper] =
11931193
print(ASCII_ART)
11941194

11951195
if jobs:
1196-
import multiprocessing
1196+
import multiprocessing # noqa: PLC0415
11971197

11981198
executor = multiprocessing.Pool(jobs if jobs > 0 else multiprocessing.cpu_count())
11991199
attempt_iterator = executor.imap(

isort/parse.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def file_contents(contents: str, config: Config = DEFAULT_CONFIG) -> ParsedConte
151151
out_lines = []
152152
original_line_count = len(in_lines)
153153
if config.old_finders:
154-
from .deprecated.finders import FindersManager
154+
from .deprecated.finders import FindersManager # noqa: PLC0415
155155

156156
finder = FindersManager(config=config).find
157157
else:
@@ -372,7 +372,7 @@ def file_contents(contents: str, config: Config = DEFAULT_CONFIG) -> ParsedConte
372372

373373
from_import = parts[0].split(" ")
374374
import_string = (" cimport " if cimports else " import ").join(
375-
[from_import[0] + " " + "".join(from_import[1:])] + parts[1:]
375+
[from_import[0] + " " + "".join(from_import[1:]), *parts[1:]]
376376
)
377377

378378
just_imports = [

isort/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,9 +931,9 @@ def entry_points(group: str) -> "EntryPoints":
931931
TODO: The reason for lazy loading here are unknown.
932932
"""
933933
if sys.version_info < (3, 10): # pragma: no cover
934-
from importlib_metadata import entry_points as ep
934+
from importlib_metadata import entry_points as ep # noqa: PLC0415
935935
else:
936-
from importlib.metadata import entry_points as ep
936+
from importlib.metadata import entry_points as ep # noqa: PLC0415
937937

938938
return ep(group=group)
939939

pyproject.toml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,41 +115,39 @@ build-backend = "hatchling.build"
115115

116116
[dependency-groups]
117117
dev = [
118-
"bandit>=1.7.7",
119-
"black>=24.3.0",
118+
"bandit>=1.8.6",
119+
"black>=25.9.0",
120120
"colorama>=0.4.6",
121-
"coverage[toml]>=6.5.0",
122-
"cruft>=2.12.0",
121+
"coverage[toml]>=7.10.7",
122+
"cruft>=2.16.0",
123123
"example-isort-sorting-plugin>=0.1.0",
124124
"example-shared-isort-profile>=0.1.0",
125-
"flake8>=3.8.4",
126-
"flake8-bugbear>=22.12.12",
125+
"flake8>=7.3.0",
126+
"flake8-bugbear>=24.12.12",
127127
"flake8-pyproject>=1.2.3",
128128
"hatch>=1.14.0",
129129
"httpx>=0.13.3",
130-
"hypothesis>=6.10.1",
131-
"hypothesmith>=0.1.3",
132-
"libcst>=0.3.18",
133-
"mypy>=1.14.1",
134-
"pep8-naming>=0.8.2",
130+
"hypothesis>=6.140.3",
131+
"hypothesmith>=0.3.3",
132+
"libcst>=1.8.5",
133+
"mypy>=1.18.2",
134+
"pep8-naming>=0.15.1",
135135
"pip>=21.1.1",
136136
"pip_api>=0.0.12",
137137
"pipreqs>=0.4.9",
138138
"portray>=1.8.0",
139-
"pre-commit>=2.13.0",
140-
"pytest>=7.4.2",
141-
"pytest-benchmark>=3.4.1",
142-
"ruff>=0.9.6",
139+
"pytest>=8.4.2",
140+
"pytest-benchmark>=5.1.0",
141+
"ruff>=0.13.3",
143142
"setuptools>=75.8.0",
144143
"stdlibs>=2024.10.21.16",
145144
"toml>=0.10.2",
146-
"tox>=4.24.1",
147-
"tox-uv>=1.25.0",
145+
"tox>=4.30.3",
146+
"tox-uv>=1.28.0",
148147
"types-colorama>=0.4.2",
149148
"types-setuptools>=70.0.0.20240523",
150149
"types-toml>=0.1.3",
151150
"uv>=0.8.23",
152-
"vulture>=1.0",
153151
]
154152

155153
[tool.flake8]
@@ -205,6 +203,7 @@ lint.ignore = [
205203
"B904",
206204
"E501",
207205
"PERF203",
206+
"PT030", # Too much work to turn on for now
208207
"RUF100",
209208
]
210209
lint.exclude = [ "isort/_vendored/*" ]

tests/unit/test_deprecated_finders.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import os
33
import posixpath
44
from pathlib import Path
5+
from typing import Optional
56
from unittest.mock import patch
67

78
from isort import sections, settings
@@ -30,7 +31,7 @@ def test_no_finders(self):
3031

3132
def test_find_broken_finder(self):
3233
class ExceptionOnFind(finders.BaseFinder):
33-
def find(*args, **kwargs):
34+
def find(self, module_name: str) -> Optional[str]:
3435
raise ValueError("test")
3536

3637
assert (

tests/unit/test_importable.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"""Basic set of tests to ensure entire code base is importable"""
22

3+
# ruff: noqa: PLC0415
4+
35
import pytest
46

57

tests/unit/test_isort.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
from isort.exceptions import ExistingSyntaxErrors, FileSkipped, MissingSection
2121
from isort.settings import Config
2222
from isort.utils import exists_case_sensitive
23+
from isort.main import parse_args
24+
from isort.main import main
2325

2426
from .utils import UnreadableStream, as_stream
2527

@@ -3762,12 +3764,10 @@ def test_monkey_patched_urllib() -> None:
37623764
with pytest.raises(ImportError):
37633765
# Previous versions of isort monkey patched urllib which caused unusual
37643766
# importing for other projects.
3765-
from urllib import quote # type: ignore # noqa: F401
3767+
from urllib import quote # type: ignore # noqa: F401, PLC0415
37663768

37673769

37683770
def test_argument_parsing() -> None:
3769-
from isort.main import parse_args
3770-
37713771
args = parse_args(["--dt", "-t", "foo", "--skip=bar", "baz.py", "--os"])
37723772
assert args["order_by_type"] is False
37733773
assert args["force_to_top"] == ["foo"]
@@ -3778,8 +3778,6 @@ def test_argument_parsing() -> None:
37783778

37793779
@pytest.mark.parametrize("multiprocess", [False, True])
37803780
def test_command_line(tmpdir, capfd, multiprocess: bool) -> None:
3781-
from isort.main import main
3782-
37833781
tmpdir.join("file1.py").write("import re\nimport os\n\nimport contextlib\n\n\nimport isort")
37843782
tmpdir.join("file2.py").write(
37853783
"import collections\nimport time\n\nimport abc" "\n\n\nimport isort"
@@ -3808,7 +3806,6 @@ def test_command_line(tmpdir, capfd, multiprocess: bool) -> None:
38083806
def test_quiet(tmpdir, capfd, quiet: bool) -> None:
38093807
if sys.platform.startswith("win"):
38103808
return
3811-
from isort.main import main
38123809

38133810
tmpdir.join("file1.py").write("import re\nimport os")
38143811
tmpdir.join("file2.py").write("")
@@ -4602,8 +4599,6 @@ def test_move_class_issue_751() -> None:
46024599

46034600

46044601
def test_python_version() -> None:
4605-
from isort.main import parse_args
4606-
46074602
# test that the py_version can be added as flag
46084603
args = parse_args(["--py=27"])
46094604
assert args["py_version"] == "27"

0 commit comments

Comments
 (0)