Skip to content

Commit e849675

Browse files
authored
Fix ruff isort configuration (#240)
As brought up in #239 (comment), the isort settings for ruff were not being applied.
1 parent 907e87a commit e849675

13 files changed

+16
-18
lines changed

pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ Homepage = "https://execnet.readthedocs.io/en/latest/"
4747

4848
[tool.ruff.lint]
4949
ignore = ["E741"]
50+
extend-select = ["I001"]
5051

5152
[tool.ruff.lint.isort]
52-
case-sensitive = true
53+
force-single-line = true
54+
known-third-party = ["src"]
5355

5456
[tool.hatch.version]
5557
source = "vcs"

src/execnet/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,21 @@
88
"""
99
from ._version import version as __version__
1010
from .gateway_base import DataFormatError
11+
from .gateway_base import RemoteError
12+
from .gateway_base import TimeoutError
1113
from .gateway_base import dump
1214
from .gateway_base import dumps
1315
from .gateway_base import load
1416
from .gateway_base import loads
15-
from .gateway_base import RemoteError
16-
from .gateway_base import TimeoutError
1717
from .gateway_bootstrap import HostNotFound
18-
from .multi import default_group
1918
from .multi import Group
20-
from .multi import makegateway
2119
from .multi import MultiChannel
20+
from .multi import default_group
21+
from .multi import makegateway
2222
from .multi import set_execmodel
2323
from .rsync import RSync
2424
from .xspec import XSpec
2525

26-
2726
__all__ = [
2827
"__version__",
2928
"makegateway",

src/execnet/gateway.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ def __repr__(self):
153153

154154

155155
def rinfo_source(channel):
156-
import sys
157156
import os
157+
import sys
158158

159159
channel.send(
160160
dict(

src/execnet/gateway_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ def trace(*msg):
425425
pass # nothing we can do, likely interpreter-shutdown
426426

427427
elif DEBUG:
428-
import tempfile
429428
import os
429+
import tempfile
430430

431431
fn = os.path.join(tempfile.gettempdir(), "execnet-debug-%d" % pid)
432432
# sys.stderr.write("execnet-debug at %r" % (fn,))

src/execnet/gateway_io.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
import sys
88

99
try:
10-
from execnet.gateway_base import Popen2IO, Message
10+
from execnet.gateway_base import Message
11+
from execnet.gateway_base import Popen2IO
1112
except ImportError:
12-
from __main__ import Popen2IO, Message # type: ignore[no-redef]
13+
from __main__ import Message # type: ignore[no-redef]
14+
from __main__ import Popen2IO # type: ignore[no-redef]
1315

1416
from functools import partial
1517

src/execnet/multi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
from . import gateway_bootstrap
1212
from . import gateway_io
13+
from .gateway_base import WorkerPool
1314
from .gateway_base import get_execmodel
1415
from .gateway_base import trace
15-
from .gateway_base import WorkerPool
1616
from .xspec import XSpec
1717

1818
NO_ENDMARKER_WANTED = object()

src/execnet/rsync_remote.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
def serve_rsync(channel):
77
import os
8-
import stat
98
import shutil
9+
import stat
1010
from hashlib import md5
1111

1212
destdir, options = channel.receive()

src/execnet/script/quitserver.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import socket
99
import sys
1010

11-
1211
host, port = sys.argv[1].split(":")
1312
hostport = (host, int(port))
1413

src/execnet/script/socketserverservice.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import win32service
1616
import win32serviceutil
1717

18-
1918
appname = "ExecNetSocketServer"
2019

2120

testing/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import execnet
88
import pytest
9-
from execnet.gateway_base import get_execmodel
109
from execnet.gateway_base import WorkerPool
10+
from execnet.gateway_base import get_execmodel
1111

1212
collect_ignore = ["build", "doc/_build"]
1313

testing/test_basics.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from execnet.gateway_base import Message
2020
from execnet.gateway_base import Popen2IO
2121

22-
2322
skip_win_pypy = pytest.mark.xfail(
2423
condition=hasattr(sys, "pypy_version_info") and sys.platform.startswith("win"),
2524
reason="failing on Windows on PyPy (#63)",

testing/test_channel.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import pytest
77

8-
98
needs_early_gc = pytest.mark.skipif("not hasattr(sys, 'getrefcount')")
109
needs_osdup = pytest.mark.skipif("not hasattr(os, 'dup')")
1110
TESTTIMEOUT = 10.0 # seconds

testing/test_serializer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import execnet
77
import pytest
88

9-
109
# We use the execnet folder in order to avoid triggering a missing apipkg.
1110
pyimportdir = os.fspath(Path(execnet.__file__).parent)
1211

0 commit comments

Comments
 (0)