From 475b346fd91c909a01213c06c9cbd2b688b7c233 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 7 Dec 2024 08:46:25 -0300 Subject: [PATCH] Run pyupgrade --py39-plus on all files --- src/xdist/_path.py | 2 +- src/xdist/dsession.py | 2 +- src/xdist/looponfail.py | 6 +++--- src/xdist/newhooks.py | 2 +- src/xdist/remote.py | 8 ++++---- src/xdist/report.py | 2 +- src/xdist/scheduler/each.py | 2 +- src/xdist/scheduler/load.py | 2 +- src/xdist/scheduler/loadscope.py | 2 +- src/xdist/scheduler/protocol.py | 2 +- src/xdist/scheduler/worksteal.py | 2 +- src/xdist/workermanage.py | 2 +- testing/conftest.py | 4 ++-- testing/test_dsession.py | 2 +- testing/test_remote.py | 3 +-- 15 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/xdist/_path.py b/src/xdist/_path.py index 1732300d..22881fc7 100644 --- a/src/xdist/_path.py +++ b/src/xdist/_path.py @@ -1,8 +1,8 @@ +from collections.abc import Iterator from itertools import chain import os from pathlib import Path from typing import Callable -from typing import Iterator def visit_path( diff --git a/src/xdist/dsession.py b/src/xdist/dsession.py index 62079a28..5bf7d980 100644 --- a/src/xdist/dsession.py +++ b/src/xdist/dsession.py @@ -1,12 +1,12 @@ from __future__ import annotations +from collections.abc import Sequence from enum import auto from enum import Enum from queue import Empty from queue import Queue import sys from typing import Any -from typing import Sequence import warnings import execnet diff --git a/src/xdist/looponfail.py b/src/xdist/looponfail.py index aa8852fe..128127a6 100644 --- a/src/xdist/looponfail.py +++ b/src/xdist/looponfail.py @@ -9,12 +9,12 @@ from __future__ import annotations +from collections.abc import Sequence import os from pathlib import Path import sys import time from typing import Any -from typing import Sequence from _pytest._io import TerminalWriter import execnet @@ -158,9 +158,9 @@ def repr_pytest_looponfailinfo( def init_worker_session( - channel: "execnet.Channel", # noqa: UP037 + channel: execnet.Channel, args: list[str], - option_dict: dict[str, "Any"], # noqa: UP037 + option_dict: dict[str, Any], ) -> None: import os import sys diff --git a/src/xdist/newhooks.py b/src/xdist/newhooks.py index 5bfce7c4..23275362 100644 --- a/src/xdist/newhooks.py +++ b/src/xdist/newhooks.py @@ -14,9 +14,9 @@ from __future__ import annotations +from collections.abc import Sequence import os from typing import Any -from typing import Sequence from typing import TYPE_CHECKING import execnet diff --git a/src/xdist/remote.py b/src/xdist/remote.py index 5439f6f0..0a303066 100644 --- a/src/xdist/remote.py +++ b/src/xdist/remote.py @@ -9,16 +9,16 @@ from __future__ import annotations import collections +from collections.abc import Generator +from collections.abc import Iterable +from collections.abc import Sequence import contextlib import enum import os import sys import time from typing import Any -from typing import Generator -from typing import Iterable from typing import Literal -from typing import Sequence from typing import TypedDict from typing import Union import warnings @@ -98,7 +98,7 @@ def replace(self, iterable: Iterable[Item]) -> None: self._items = collections.deque(iterable) @contextlib.contextmanager - def lock(self) -> Generator[collections.deque[Item], None, None]: + def lock(self) -> Generator[collections.deque[Item]]: with self._lock: try: yield self._items diff --git a/src/xdist/report.py b/src/xdist/report.py index ea00e5bf..2eb4d21d 100644 --- a/src/xdist/report.py +++ b/src/xdist/report.py @@ -1,7 +1,7 @@ from __future__ import annotations +from collections.abc import Sequence from difflib import unified_diff -from typing import Sequence def report_collection_diff( diff --git a/src/xdist/scheduler/each.py b/src/xdist/scheduler/each.py index aa4f7ba1..8552b53f 100644 --- a/src/xdist/scheduler/each.py +++ b/src/xdist/scheduler/each.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Sequence +from collections.abc import Sequence import pytest diff --git a/src/xdist/scheduler/load.py b/src/xdist/scheduler/load.py index 9d153bb9..ac011e57 100644 --- a/src/xdist/scheduler/load.py +++ b/src/xdist/scheduler/load.py @@ -1,7 +1,7 @@ from __future__ import annotations +from collections.abc import Sequence from itertools import cycle -from typing import Sequence import pytest diff --git a/src/xdist/scheduler/loadscope.py b/src/xdist/scheduler/loadscope.py index a4d63b29..ee3f2fdf 100644 --- a/src/xdist/scheduler/loadscope.py +++ b/src/xdist/scheduler/loadscope.py @@ -1,8 +1,8 @@ from __future__ import annotations from collections import OrderedDict +from collections.abc import Sequence from typing import NoReturn -from typing import Sequence import pytest diff --git a/src/xdist/scheduler/protocol.py b/src/xdist/scheduler/protocol.py index 0435d15b..2e9129c3 100644 --- a/src/xdist/scheduler/protocol.py +++ b/src/xdist/scheduler/protocol.py @@ -1,7 +1,7 @@ from __future__ import annotations +from collections.abc import Sequence from typing import Protocol -from typing import Sequence from xdist.workermanage import WorkerController diff --git a/src/xdist/scheduler/worksteal.py b/src/xdist/scheduler/worksteal.py index fd208486..28708fcc 100644 --- a/src/xdist/scheduler/worksteal.py +++ b/src/xdist/scheduler/worksteal.py @@ -1,7 +1,7 @@ from __future__ import annotations +from collections.abc import Sequence from typing import NamedTuple -from typing import Sequence import pytest diff --git a/src/xdist/workermanage.py b/src/xdist/workermanage.py index 44d1be4c..08ba243f 100644 --- a/src/xdist/workermanage.py +++ b/src/xdist/workermanage.py @@ -1,5 +1,6 @@ from __future__ import annotations +from collections.abc import Sequence import enum import fnmatch import os @@ -9,7 +10,6 @@ from typing import Any from typing import Callable from typing import Literal -from typing import Sequence from typing import Union import uuid import warnings diff --git a/testing/conftest.py b/testing/conftest.py index 5186b8b6..717e6679 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -1,8 +1,8 @@ from __future__ import annotations +from collections.abc import Generator import shutil from typing import Callable -from typing import Generator import execnet import pytest @@ -12,7 +12,7 @@ @pytest.fixture(autouse=True) -def _divert_atexit(monkeypatch: pytest.MonkeyPatch) -> Generator[None, None, None]: +def _divert_atexit(monkeypatch: pytest.MonkeyPatch) -> Generator[None]: import atexit finalizers = [] diff --git a/testing/test_dsession.py b/testing/test_dsession.py index 184fe353..680b7ae0 100644 --- a/testing/test_dsession.py +++ b/testing/test_dsession.py @@ -1,8 +1,8 @@ from __future__ import annotations +from collections.abc import Sequence from typing import Any from typing import cast -from typing import Sequence from typing import TYPE_CHECKING import execnet diff --git a/testing/test_remote.py b/testing/test_remote.py index b995cc4a..ba24295c 100644 --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -7,7 +7,6 @@ from typing import Any from typing import Callable from typing import cast -from typing import Dict from typing import Union import uuid @@ -90,7 +89,7 @@ def worker(request: pytest.FixtureRequest, pytester: pytest.Pytester) -> WorkerS class TestWorkerInteractor: UnserializerReport = Callable[ - [Dict[str, Any]], Union[pytest.CollectReport, pytest.TestReport] + [dict[str, Any]], Union[pytest.CollectReport, pytest.TestReport] ] @pytest.fixture