chore(ruff): Autofixes for ruff with Python 3.10+

uv run ruff check . --fix --show-fixes

Fixed 21 errors:
- src/libvcs/_internal/run.py:
    2 × UP007 (non-pep604-annotation-union)
    1 × UP035 (deprecated-import)
    1 × UP045 (non-pep604-annotation-optional)
- src/libvcs/_internal/shortcuts.py:
    1 × UP035 (deprecated-import)
- src/libvcs/_internal/subprocess.py:
    4 × UP007 (non-pep604-annotation-union)
    1 × UP035 (deprecated-import)
- src/libvcs/_internal/types.py:
    2 × UP007 (non-pep604-annotation-union)
    1 × UP035 (deprecated-import)
- src/libvcs/pytest_plugin.py:
    1 × UP035 (deprecated-import)
    1 × UP045 (non-pep604-annotation-optional)
- src/libvcs/sync/constants.py:
    1 × UP007 (non-pep604-annotation-union)
- src/libvcs/url/registry.py:
    1 × UP007 (non-pep604-annotation-union)
    1 × UP035 (deprecated-import)
- tests/url/test_registry.py:
    1 × UP007 (non-pep604-annotation-union)
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)

Found 30 errors (21 fixed, 9 remaining).
No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).

Author: tony

src/libvcs/_internal/run.py

@@ -37,7 +37,7 @@ def console_to_str(s: bytes) -> str:
 
 if t.TYPE_CHECKING:
     _LoggerAdapter = logging.LoggerAdapter[logging.Logger]
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 else:
     _LoggerAdapter = logging.LoggerAdapter
 
@@ -98,13 +98,10 @@ def __call__(self, output: str, timestamp: datetime.datetime) -> None:
 if sys.platform == "win32":
     _ENV: TypeAlias = Mapping[str, str]
 else:
-    _ENV: TypeAlias = t.Union[
-        Mapping[bytes, StrPath],
-        Mapping[str, StrPath],
-    ]
+    _ENV: TypeAlias = Mapping[bytes, StrPath] | Mapping[str, StrPath]
 
 _CMD = t.Union[StrPath, Sequence[StrPath]]
-_FILE: TypeAlias = t.Optional[t.Union[int, t.IO[t.Any]]]
+_FILE: TypeAlias = int | t.IO[t.Any] | None
 
 
 def run(

src/libvcs/_internal/shortcuts.py

@@ -14,7 +14,7 @@
 from libvcs.url import registry as url_tools
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeGuard
+    from typing import TypeGuard
 
     from libvcs._internal.run import ProgressCallbackProtocol
     from libvcs._internal.types import StrPath, VCSLiteral

src/libvcs/_internal/subprocess.py

@@ -52,7 +52,7 @@
 from .dataclasses import SkipDefaultFieldsReprMixin
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 
 F = t.TypeVar("F", bound=t.Callable[..., t.Any])
@@ -66,14 +66,11 @@ def __init__(self, output: str, *args: object) -> None:
 if sys.platform == "win32":
     _ENV: TypeAlias = Mapping[str, str]
 else:
-    _ENV: TypeAlias = t.Union[
-        Mapping[bytes, StrOrBytesPath],
-        Mapping[str, StrOrBytesPath],
-    ]
-_FILE: TypeAlias = t.Union[None, int, t.IO[t.Any]]
-_TXT: TypeAlias = t.Union[bytes, str]
+    _ENV: TypeAlias = Mapping[bytes, StrOrBytesPath] | Mapping[str, StrOrBytesPath]
+_FILE: TypeAlias = None | int | t.IO[t.Any]
+_TXT: TypeAlias = bytes | str
 #: Command
-_CMD: TypeAlias = t.Union[StrOrBytesPath, Sequence[StrOrBytesPath]]
+_CMD: TypeAlias = StrOrBytesPath | Sequence[StrOrBytesPath]
 
 
 @dataclasses.dataclass(repr=False)

src/libvcs/_internal/types.py

@@ -13,17 +13,12 @@
 from os import PathLike
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
-StrPath: TypeAlias = t.Union[str, PathLike[str]]  # stable
+StrPath: TypeAlias = str | PathLike[str]  # stable
 """:class:`os.PathLike` or :class:`str`"""
 
-StrOrBytesPath: TypeAlias = t.Union[
-    str,
-    bytes,
-    PathLike[str],
-    PathLike[bytes],  # stable
-]
+StrOrBytesPath: TypeAlias = str | bytes | PathLike[str] | PathLike[bytes]
 """:class:`os.PathLike`, :class:`str` or :term:`bytes-like object`"""
 
 

src/libvcs/pytest_plugin.py

@@ -19,7 +19,7 @@
 from libvcs.sync.svn import SvnSync
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     from libvcs._internal.run import _ENV
 
@@ -270,7 +270,7 @@ def unique_repo_name(remote_repos_path: pathlib.Path, max_retries: int = 15) ->
         return remote_repo_name
 
 
-InitCmdArgs: TypeAlias = t.Optional[list[str]]
+InitCmdArgs: TypeAlias = list[str] | None
 
 
 class CreateRepoPostInitFn(t.Protocol):

src/libvcs/sync/constants.py

@@ -9,7 +9,7 @@
 #: Default VCS systems by string (in :data:`DEFAULT_VCS_CLASS_MAP`)
 DEFAULT_VCS_LITERAL = t.Literal["git", "hg", "svn"]
 #: Union of VCS Classes
-DEFAULT_VCS_CLASS_UNION = type[t.Union[GitSync, HgSync, SvnSync]]
+DEFAULT_VCS_CLASS_UNION = type[GitSync | HgSync | SvnSync]
 #: ``str`` -> ``class`` Map. ``DEFAULT_VCS_CLASS_MAP['git']`` ->
 #: :class:`~libvcs.sync.git.GitSync`
 DEFAULT_VCS_CLASS_MAP: dict[DEFAULT_VCS_LITERAL, DEFAULT_VCS_CLASS_UNION] = {

src/libvcs/url/registry.py

@@ -7,11 +7,11 @@
 from libvcs._internal.module_loading import import_string
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     from .base import URLProtocol
 
-    ParserLazyMap: TypeAlias = dict[str, t.Union[type[URLProtocol], str]]
+    ParserLazyMap: TypeAlias = dict[str, type[URLProtocol] | str]
     ParserMap: TypeAlias = dict[str, type[URLProtocol]]
 
 DEFAULT_PARSERS: ParserLazyMap = {

tests/url/test_registry.py

@@ -13,14 +13,10 @@
 
 if t.TYPE_CHECKING:
     from collections.abc import Callable
-
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     ParserMatchLazy: TypeAlias = Callable[[str], registry.ParserMatch]
-    DetectVCSFixtureExpectedMatch: TypeAlias = t.Union[
-        registry.ParserMatch,
-        ParserMatchLazy,
-    ]
+    DetectVCSFixtureExpectedMatch: TypeAlias = registry.ParserMatch | ParserMatchLazy
 
 
 class DetectVCSFixture(t.NamedTuple):