From e3b69d4f29a1dc376a0f331293c68910978ca002 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Wed, 3 Apr 2024 00:13:06 +0300 Subject: [PATCH] Sort imports Using pytest's style. --- src/xdist/__init__.py | 11 +++++------ src/xdist/_path.py | 5 +++-- src/xdist/dsession.py | 23 +++++++++++------------ src/xdist/looponfail.py | 9 +++++---- src/xdist/plugin.py | 2 +- src/xdist/remote.py | 9 +++++---- src/xdist/scheduler/__init__.py | 12 ++++++------ src/xdist/scheduler/each.py | 2 +- src/xdist/scheduler/load.py | 2 +- src/xdist/scheduler/loadfile.py | 3 ++- src/xdist/scheduler/loadgroup.py | 3 ++- src/xdist/scheduler/loadscope.py | 1 + src/xdist/scheduler/worksteal.py | 2 +- src/xdist/workermanage.py | 18 ++++++++++++------ testing/acceptance_test.py | 1 + testing/conftest.py | 6 ++++-- testing/test_dsession.py | 20 +++++++++++--------- testing/test_looponfail.py | 8 ++++---- testing/test_plugin.py | 6 +++--- testing/test_remote.py | 9 +++++---- testing/test_workermanage.py | 13 +++++++++---- 21 files changed, 93 insertions(+), 72 deletions(-) diff --git a/src/xdist/__init__.py b/src/xdist/__init__.py index 031a3d3..ed5a4d9 100644 --- a/src/xdist/__init__.py +++ b/src/xdist/__init__.py @@ -1,10 +1,9 @@ -from xdist.plugin import ( - is_xdist_worker, - is_xdist_master, - get_xdist_worker_id, - is_xdist_controller, -) from xdist._version import version as __version__ +from xdist.plugin import get_xdist_worker_id +from xdist.plugin import is_xdist_controller +from xdist.plugin import is_xdist_master +from xdist.plugin import is_xdist_worker + __all__ = [ "__version__", diff --git a/src/xdist/_path.py b/src/xdist/_path.py index 0af3209..1732300 100644 --- a/src/xdist/_path.py +++ b/src/xdist/_path.py @@ -1,7 +1,8 @@ -import os from itertools import chain +import os from pathlib import Path -from typing import Callable, Iterator +from typing import Callable +from typing import Iterator def visit_path( diff --git a/src/xdist/dsession.py b/src/xdist/dsession.py index bae9279..6be93e0 100644 --- a/src/xdist/dsession.py +++ b/src/xdist/dsession.py @@ -1,23 +1,22 @@ from __future__ import annotations + +from enum import auto +from enum import Enum +from queue import Empty +from queue import Queue import sys -from enum import Enum, auto from typing import Sequence import pytest from xdist.remote import Producer +from xdist.scheduler import EachScheduling +from xdist.scheduler import LoadFileScheduling +from xdist.scheduler import LoadGroupScheduling +from xdist.scheduler import LoadScheduling +from xdist.scheduler import LoadScopeScheduling +from xdist.scheduler import WorkStealingScheduling from xdist.workermanage import NodeManager -from xdist.scheduler import ( - EachScheduling, - LoadScheduling, - LoadScopeScheduling, - LoadFileScheduling, - LoadGroupScheduling, - WorkStealingScheduling, -) - - -from queue import Empty, Queue class Interrupted(KeyboardInterrupt): diff --git a/src/xdist/looponfail.py b/src/xdist/looponfail.py index 370cb8b..929f3d4 100644 --- a/src/xdist/looponfail.py +++ b/src/xdist/looponfail.py @@ -9,13 +9,14 @@ import os from pathlib import Path -from typing import Dict, Sequence - -import pytest import sys import time -import execnet +from typing import Dict +from typing import Sequence + from _pytest._io import TerminalWriter +import execnet +import pytest from xdist._path import visit_path diff --git a/src/xdist/plugin.py b/src/xdist/plugin.py index c1350b4..cef61c0 100644 --- a/src/xdist/plugin.py +++ b/src/xdist/plugin.py @@ -1,6 +1,6 @@ import os -import uuid import sys +import uuid import warnings import pytest diff --git a/src/xdist/remote.py b/src/xdist/remote.py index cba91bc..70aa870 100644 --- a/src/xdist/remote.py +++ b/src/xdist/remote.py @@ -7,15 +7,16 @@ """ import contextlib -import sys import os +import sys import time from typing import Any -import pytest -from execnet.gateway_base import dumps, DumpError - from _pytest.config import _prepareconfig +from execnet.gateway_base import DumpError +from execnet.gateway_base import dumps +import pytest + try: from setproctitle import setproctitle diff --git a/src/xdist/scheduler/__init__.py b/src/xdist/scheduler/__init__.py index 9201cda..54be9ad 100644 --- a/src/xdist/scheduler/__init__.py +++ b/src/xdist/scheduler/__init__.py @@ -1,6 +1,6 @@ -from xdist.scheduler.each import EachScheduling # noqa -from xdist.scheduler.load import LoadScheduling # noqa -from xdist.scheduler.loadfile import LoadFileScheduling # noqa -from xdist.scheduler.loadscope import LoadScopeScheduling # noqa -from xdist.scheduler.loadgroup import LoadGroupScheduling # noqa -from xdist.scheduler.worksteal import WorkStealingScheduling # noqa +from xdist.scheduler.each import EachScheduling as EachScheduling +from xdist.scheduler.load import LoadScheduling as LoadScheduling +from xdist.scheduler.loadfile import LoadFileScheduling as LoadFileScheduling +from xdist.scheduler.loadgroup import LoadGroupScheduling as LoadGroupScheduling +from xdist.scheduler.loadscope import LoadScopeScheduling as LoadScopeScheduling +from xdist.scheduler.worksteal import WorkStealingScheduling as WorkStealingScheduling diff --git a/src/xdist/scheduler/each.py b/src/xdist/scheduler/each.py index 4579102..329ce68 100644 --- a/src/xdist/scheduler/each.py +++ b/src/xdist/scheduler/each.py @@ -1,6 +1,6 @@ from xdist.remote import Producer -from xdist.workermanage import parse_spec_config from xdist.report import report_collection_diff +from xdist.workermanage import parse_spec_config class EachScheduling: diff --git a/src/xdist/scheduler/load.py b/src/xdist/scheduler/load.py index ccca68b..87d9cb2 100644 --- a/src/xdist/scheduler/load.py +++ b/src/xdist/scheduler/load.py @@ -3,8 +3,8 @@ from itertools import cycle from _pytest.runner import CollectReport from xdist.remote import Producer -from xdist.workermanage import parse_spec_config from xdist.report import report_collection_diff +from xdist.workermanage import parse_spec_config class LoadScheduling: diff --git a/src/xdist/scheduler/loadfile.py b/src/xdist/scheduler/loadfile.py index 91b5938..9ddd535 100644 --- a/src/xdist/scheduler/loadfile.py +++ b/src/xdist/scheduler/loadfile.py @@ -1,6 +1,7 @@ -from .loadscope import LoadScopeScheduling from xdist.remote import Producer +from .loadscope import LoadScopeScheduling + class LoadFileScheduling(LoadScopeScheduling): """Implement load scheduling across nodes, but grouping test test file. diff --git a/src/xdist/scheduler/loadgroup.py b/src/xdist/scheduler/loadgroup.py index ecefa49..1dee40e 100644 --- a/src/xdist/scheduler/loadgroup.py +++ b/src/xdist/scheduler/loadgroup.py @@ -1,6 +1,7 @@ -from .loadscope import LoadScopeScheduling from xdist.remote import Producer +from .loadscope import LoadScopeScheduling + class LoadGroupScheduling(LoadScopeScheduling): """Implement load scheduling across nodes, but grouping test by xdist_group mark. diff --git a/src/xdist/scheduler/loadscope.py b/src/xdist/scheduler/loadscope.py index bcfe11f..af92935 100644 --- a/src/xdist/scheduler/loadscope.py +++ b/src/xdist/scheduler/loadscope.py @@ -1,6 +1,7 @@ from collections import OrderedDict from _pytest.runner import CollectReport + from xdist.remote import Producer from xdist.report import report_collection_diff from xdist.workermanage import parse_spec_config diff --git a/src/xdist/scheduler/worksteal.py b/src/xdist/scheduler/worksteal.py index 01619ea..055efa4 100644 --- a/src/xdist/scheduler/worksteal.py +++ b/src/xdist/scheduler/worksteal.py @@ -3,8 +3,8 @@ from collections import namedtuple from _pytest.runner import CollectReport from xdist.remote import Producer -from xdist.workermanage import parse_spec_config from xdist.report import report_collection_diff +from xdist.workermanage import parse_spec_config NodePending = namedtuple("NodePending", ["node", "pending"]) diff --git a/src/xdist/workermanage.py b/src/xdist/workermanage.py index 9c72431..1de00ad 100644 --- a/src/xdist/workermanage.py +++ b/src/xdist/workermanage.py @@ -1,17 +1,23 @@ import fnmatch import os +from pathlib import Path import re import sys +from typing import Any +from typing import List +from typing import Optional +from typing import Sequence +from typing import Set +from typing import Tuple +from typing import Union import uuid -from pathlib import Path -from typing import List, Union, Sequence, Optional, Any, Tuple, Set -import pytest import execnet +import pytest +from xdist.plugin import _sys_path import xdist.remote from xdist.remote import Producer -from xdist.plugin import _sys_path def parse_spec_config(config): @@ -89,8 +95,8 @@ class NodeManager: break else: return [] - import pytest import _pytest + import pytest def get_dir(p): """Return the directory path if p is a package or the path to the .py file otherwise.""" @@ -405,8 +411,8 @@ class WorkerController: def unserialize_warning_message(data): - import warnings import importlib + import warnings if data["message_module"]: mod = importlib.import_module(data["message_module"]) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index acfa8d4..40745f6 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -6,6 +6,7 @@ from typing import List from typing import Tuple import pytest + import xdist diff --git a/testing/conftest.py b/testing/conftest.py index dd7293d..195fb87 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -1,8 +1,10 @@ -import execnet -import pytest import shutil from typing import List +import execnet +import pytest + + pytest_plugins = "pytester" diff --git a/testing/test_dsession.py b/testing/test_dsession.py index f809dc4..432f167 100644 --- a/testing/test_dsession.py +++ b/testing/test_dsession.py @@ -1,16 +1,18 @@ from __future__ import annotations -from xdist.dsession import ( - DSession, - get_default_max_worker_restart, - get_workers_status_line, - WorkerStatus, -) -from xdist.report import report_collection_diff -from xdist.scheduler import EachScheduling, LoadScheduling, WorkStealingScheduling + from typing import Sequence -import pytest import execnet +import pytest + +from xdist.dsession import DSession +from xdist.dsession import get_default_max_worker_restart +from xdist.dsession import get_workers_status_line +from xdist.dsession import WorkerStatus +from xdist.report import report_collection_diff +from xdist.scheduler import EachScheduling +from xdist.scheduler import LoadScheduling +from xdist.scheduler import WorkStealingScheduling class MockGateway: diff --git a/testing/test_looponfail.py b/testing/test_looponfail.py index 65a89fb..2879e4d 100644 --- a/testing/test_looponfail.py +++ b/testing/test_looponfail.py @@ -1,12 +1,12 @@ import pathlib +from pathlib import Path +import shutil import tempfile -import unittest.mock +import textwrap from typing import List +import unittest.mock import pytest -import shutil -import textwrap -from pathlib import Path from xdist.looponfail import RemoteControl from xdist.looponfail import StatRecorder diff --git a/testing/test_plugin.py b/testing/test_plugin.py index 4bf514b..951b882 100644 --- a/testing/test_plugin.py +++ b/testing/test_plugin.py @@ -1,13 +1,13 @@ from contextlib import suppress +import os from pathlib import Path import sys -import os import execnet -from xdist.workermanage import NodeManager - import pytest +from xdist.workermanage import NodeManager + @pytest.fixture def monkeypatch_3_cpus(monkeypatch: pytest.MonkeyPatch): diff --git a/testing/test_remote.py b/testing/test_remote.py index 4e37262..26ded17 100644 --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -1,13 +1,14 @@ +import marshal import pprint -import pytest +from queue import Queue import sys import uuid -from xdist.workermanage import WorkerController import execnet -import marshal +import pytest + +from xdist.workermanage import WorkerController -from queue import Queue WAIT_TIMEOUT = 10.0 diff --git a/testing/test_workermanage.py b/testing/test_workermanage.py index 6f5a3a4..367ce8a 100644 --- a/testing/test_workermanage.py +++ b/testing/test_workermanage.py @@ -1,14 +1,19 @@ -import execnet -import pytest +from pathlib import Path import shutil import textwrap import warnings -from pathlib import Path + +import execnet +import pytest from util import generate_warning + from xdist import workermanage from xdist._path import visit_path from xdist.remote import serialize_warning_message -from xdist.workermanage import HostRSync, NodeManager, unserialize_warning_message +from xdist.workermanage import HostRSync +from xdist.workermanage import NodeManager +from xdist.workermanage import unserialize_warning_message + pytest_plugins = "pytester"