Apply new ruff rules (#2063)

Author: DimitriPapadopoulos

backend/src/hatchling/builders/config.py

@@ -3,7 +3,7 @@
 import os
 from contextlib import contextmanager
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Generator, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 
 import pathspec
 
@@ -13,6 +13,8 @@
 from hatchling.utils.fs import locate_file
 
 if TYPE_CHECKING:
+    from collections.abc import Generator
+
     from hatchling.builders.plugin.interface import BuilderInterface
 
 

backend/src/hatchling/builders/plugin/interface.py

@@ -3,14 +3,16 @@
 import os
 import re
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, Callable, Generator, Generic, Iterable, cast
+from typing import TYPE_CHECKING, Any, Callable, Generic, cast
 
 from hatchling.builders.config import BuilderConfig, BuilderConfigBound, env_var_enabled
 from hatchling.builders.constants import EXCLUDED_DIRECTORIES, EXCLUDED_FILES, BuildEnvVars
 from hatchling.builders.utils import get_relative_path, safe_walk
 from hatchling.plugin.manager import PluginManagerBound
 
 if TYPE_CHECKING:
+    from collections.abc import Generator, Iterable
+
     from hatchling.bridge.app import Application
     from hatchling.builders.hooks.plugin.interface import BuildHookInterface
     from hatchling.metadata.core import ProjectMetadata

backend/src/hatchling/builders/utils.py

@@ -3,9 +3,10 @@
 import os
 import shutil
 from base64 import urlsafe_b64encode
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from zipfile import ZipInfo
 
 

backend/src/hatchling/builders/wheel.py

@@ -9,7 +9,7 @@
 import zipfile
 from functools import cached_property
 from io import StringIO
-from typing import TYPE_CHECKING, Any, Callable, Iterable, NamedTuple, Sequence, Tuple, cast
+from typing import TYPE_CHECKING, Any, Callable, NamedTuple, cast
 
 from hatchling.__about__ import __version__
 from hatchling.builders.config import BuilderConfig
@@ -29,12 +29,13 @@
 from hatchling.metadata.spec import DEFAULT_METADATA_VERSION, get_core_metadata_constructors
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Sequence
     from types import TracebackType
 
     from hatchling.builders.plugin.interface import IncludedFile
 
 
-TIME_TUPLE = Tuple[int, int, int, int, int, int]
+TIME_TUPLE = tuple[int, int, int, int, int, int]
 
 
 class FileSelectionOptions(NamedTuple):

backend/src/hatchling/utils/context.py

@@ -5,10 +5,13 @@
 from abc import ABC, abstractmethod
 from collections import ChainMap
 from contextlib import contextmanager
-from typing import Any, Iterable, Iterator, Mapping, MutableMapping, Sequence
+from typing import TYPE_CHECKING, Any
 
 from hatchling.utils.fs import path_to_uri
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator, Mapping, MutableMapping, Sequence
+
 
 class ContextFormatter(ABC):
     @abstractmethod

backend/src/hatchling/version/scheme/standard.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Tuple, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from hatchling.version.scheme.plugin.interface import VersionSchemeInterface
 
@@ -95,4 +95,4 @@ def update_release(original_version: Version, new_release_parts: list[int]) -> t
 def parse_letter_version(*args: Any, **kwargs: Any) -> tuple[str, int]:
     from packaging.version import _parse_letter_version  # noqa: PLC2701
 
-    return cast(Tuple[str, int], _parse_letter_version(*args, **kwargs))
+    return cast(tuple[str, int], _parse_letter_version(*args, **kwargs))

src/hatch/env/plugin/interface.py

@@ -6,15 +6,15 @@
 from contextlib import contextmanager
 from functools import cached_property
 from os.path import isabs
-from typing import TYPE_CHECKING, Generator
+from typing import TYPE_CHECKING
 
 from hatch.config.constants import AppEnvVars
 from hatch.env.utils import add_verbosity_flag, get_env_var_option
 from hatch.project.utils import format_script_commands, parse_script_command
 from hatch.utils.structures import EnvVars
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
+    from collections.abc import Generator, Iterable
 
     from hatch.utils.fs import Path
 

src/hatch/project/core.py

@@ -3,13 +3,15 @@
 import re
 from contextlib import contextmanager
 from functools import cached_property
-from typing import TYPE_CHECKING, Generator, cast
+from typing import TYPE_CHECKING, cast
 
 from hatch.project.env import EnvironmentMetadata
 from hatch.utils.fs import Path
 from hatch.utils.runner import ExecutionContext
 
 if TYPE_CHECKING:
+    from collections.abc import Generator
+
     from hatch.cli.application import Application
     from hatch.config.model import RootConfig
     from hatch.env.plugin.interface import EnvironmentInterface

src/hatch/project/frontend/core.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 import json
-import sys
-from functools import lru_cache
+from functools import cache
 from typing import TYPE_CHECKING, Any, Literal
 
 from hatch.utils.fs import Path
@@ -295,58 +294,33 @@ def get_core_metadata(self, *, output_dir: str, project_root: str) -> str:
         )
 
 
-if sys.version_info[:2] >= (3, 9):
+@cache
+def hook_caller_script() -> str:
+    from importlib.resources import files
 
-    @lru_cache(maxsize=None)
-    def hook_caller_script() -> str:
-        from importlib.resources import files
+    script = files('pyproject_hooks._in_process') / '_in_process.py'
+    return script.read_text(encoding='utf-8')
 
-        script = files('pyproject_hooks._in_process') / '_in_process.py'
-        return script.read_text(encoding='utf-8')
 
-    @lru_cache(maxsize=None)
-    def runner_script() -> str:
-        from importlib.resources import files
+@cache
+def runner_script() -> str:
+    from importlib.resources import files
 
-        script = files('hatch.project.frontend.scripts') / 'standard.py'
-        return script.read_text(encoding='utf-8')
+    script = files('hatch.project.frontend.scripts') / 'standard.py'
+    return script.read_text(encoding='utf-8')
 
-    @lru_cache(maxsize=None)
-    def hatch_build_deps_script() -> str:
-        from importlib.resources import files
 
-        script = files('hatch.project.frontend.scripts') / 'build_deps.py'
-        return script.read_text(encoding='utf-8')
+@cache
+def hatch_build_deps_script() -> str:
+    from importlib.resources import files
 
-    @lru_cache(maxsize=None)
-    def hatch_core_metadata_script() -> str:
-        from importlib.resources import files
+    script = files('hatch.project.frontend.scripts') / 'build_deps.py'
+    return script.read_text(encoding='utf-8')
 
-        script = files('hatch.project.frontend.scripts') / 'core_metadata.py'
-        return script.read_text(encoding='utf-8')
 
-else:
+@cache
+def hatch_core_metadata_script() -> str:
+    from importlib.resources import files
 
-    @lru_cache(maxsize=None)
-    def hook_caller_script() -> str:
-        from importlib.resources import read_text
-
-        return read_text('pyproject_hooks._in_process', '_in_process.py')
-
-    @lru_cache(maxsize=None)
-    def runner_script() -> str:
-        from importlib.resources import read_text
-
-        return read_text('hatch.project.frontend.scripts', 'standard.py')
-
-    @lru_cache(maxsize=None)
-    def hatch_build_deps_script() -> str:
-        from importlib.resources import read_text
-
-        return read_text('hatch.project.frontend.scripts', 'build_deps.py')
-
-    @lru_cache(maxsize=None)
-    def hatch_core_metadata_script() -> str:
-        from importlib.resources import read_text
-
-        return read_text('hatch.project.frontend.scripts', 'core_metadata.py')
+    script = files('hatch.project.frontend.scripts') / 'core_metadata.py'
+    return script.read_text(encoding='utf-8')

src/hatch/project/utils.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
-from typing import Any, Iterable
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
 
 
 def parse_script_command(command: str) -> tuple[str, str, bool]: