chore(ruff) Automated fixes for typing annotations

Fixed 20 errors:
- conftest.py:
    1 × I002 (missing-required-import)
- docs/conf.py:
    2 × UP007 (non-pep604-annotation)
    2 × UP037 (quoted-annotation)
    1 × I002 (missing-required-import)
- src/g/__about__.py:
    1 × I002 (missing-required-import)
- src/g/__init__.py:
    4 × UP007 (non-pep604-annotation)
    3 × UP037 (quoted-annotation)
    1 × I002 (missing-required-import)
- tests/test_cli.py:
    3 × UP007 (non-pep604-annotation)
    1 × TC003 (typing-only-standard-library-import)
    1 × I002 (missing-required-import)

Found 58 errors (20 fixed, 38 remaining).
5 files reformatted

uv run ruff check --select ALL . --fix --unsafe-fixes --preview --show-fixes; uv run ruff format .

Author: tony

conftest.py

@@ -1,5 +1,7 @@
 """Setup pytest for g."""
 
+from __future__ import annotations
+
 import pytest
 
 

docs/conf.py

@@ -1,6 +1,8 @@
 # flake8: noqa: E501
 """Sphinx configuration for g."""
 
+from __future__ import annotations
+
 import contextlib
 import inspect
 import pathlib
@@ -71,7 +73,7 @@
 html_extra_path = ["manifest.json"]
 html_theme = "furo"
 html_theme_path: list[str] = []
-html_theme_options: dict[str, t.Union[str, list[dict[str, str]]]] = {
+html_theme_options: dict[str, str | list[dict[str, str]]] = {
     "light_logo": "img/g.svg",
     "dark_logo": "img/g-dark.svg",
     "footer_icons": [
@@ -129,7 +131,7 @@
 }
 
 
-def linkcode_resolve(domain: str, info: dict[str, str]) -> t.Union[None, str]:
+def linkcode_resolve(domain: str, info: dict[str, str]) -> None | str:
     """
     Determine the URL corresponding to Python object.
 
@@ -199,7 +201,7 @@ def linkcode_resolve(domain: str, info: dict[str, str]) -> t.Union[None, str]:
     )
 
 
-def remove_tabs_js(app: "Sphinx", exc: Exception) -> None:
+def remove_tabs_js(app: Sphinx, exc: Exception) -> None:
     """Remove tabs.js from _static after build."""
     # Fix for sphinx-inline-tabs#18
     if app.builder.format == "html" and not exc:
@@ -208,6 +210,6 @@ def remove_tabs_js(app: "Sphinx", exc: Exception) -> None:
             tabs_js.unlink()  # When python 3.7 deprecated, use missing_ok=True
 
 
-def setup(app: "Sphinx") -> None:
+def setup(app: Sphinx) -> None:
     """Configure Sphinx app hooks."""
     app.connect("build-finished", remove_tabs_js)

src/g/__about__.py

@@ -1,5 +1,7 @@
 """Metadata package for g."""
 
+from __future__ import annotations
+
 __title__ = "g"
 __package_name__ = "g"
 __description__ = "CLI alias for your current directory's VCS command: git, svn, hg"

src/g/__init__.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 """Package for g."""
 
+from __future__ import annotations
+
 import io
 import logging
 import os
@@ -17,7 +19,7 @@
 log = logging.getLogger(__name__)
 
 
-def find_repo_type(path: t.Union[pathlib.Path, str]) -> t.Optional[str]:
+def find_repo_type(path: pathlib.Path | str) -> str | None:
     """Detect repo type looking upwards."""
     for _path in [*list(pathlib.Path(path).parents), pathlib.Path(path)]:
         for p in _path.iterdir():
@@ -30,12 +32,12 @@ def find_repo_type(path: t.Union[pathlib.Path, str]) -> t.Optional[str]:
 
 
 def run(
-    cmd: t.Union[str, bytes, "PathLike[str]", "PathLike[bytes]", object] = DEFAULT,
+    cmd: str | bytes | PathLike[str] | PathLike[bytes] | object = DEFAULT,
     cmd_args: object = DEFAULT,
     wait: bool = False,
     *args: object,
     **kwargs: t.Any,
-) -> t.Optional["subprocess.Popen[str]"]:
+) -> subprocess.Popen[str] | None:
     """CLI Entrypoint for g, overlay for current directory's VCS utility.
 
     Environment variables

tests/test_cli.py

@@ -1,7 +1,8 @@
 """Tests for g's CLI package."""
 
+from __future__ import annotations
+
 import enum
-import pathlib
 import subprocess
 import typing as t
 from unittest.mock import patch
@@ -10,11 +11,14 @@
 
 from g import run
 
+if t.TYPE_CHECKING:
+    import pathlib
+
 
 def get_output(
     *args: t.Any,
     **kwargs: t.Any,
-) -> t.Union[subprocess.CalledProcessError, t.Any]:
+) -> subprocess.CalledProcessError | t.Any:
     """Retrieve output from CLI subprocess, whether success or error."""
     try:
         return subprocess.check_output(*args, **kwargs)
@@ -49,7 +53,7 @@ class CommandLineTestFixture(t.NamedTuple):
     argv_args: list[str]
 
     # results
-    expect_cmd: t.Optional[str]
+    expect_cmd: str | None
 
 
 TEST_FIXTURES: list[CommandLineTestFixture] = [
@@ -90,7 +94,7 @@ def test_command_line(
     test_id: str,
     env: EnvFlag,
     argv_args: list[str],
-    expect_cmd: t.Optional[str],
+    expect_cmd: str | None,
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: pathlib.Path,
 ) -> None: