Merge branch 'master' into warsaw/version-cli

backend/src/hatchling/builders/custom.py

@@ -16,7 +16,7 @@
 class CustomBuilder(Generic[PluginManagerBound]):
     PLUGIN_NAME = 'custom'
 
-    def __new__(  # type: ignore
+    def __new__(  # type: ignore[misc]
         cls,
         root: str,
         plugin_manager: PluginManagerBound | None = None,
@@ -45,7 +45,7 @@ def __new__(  # type: ignore
             message = f'Build script does not exist: {build_script}'
             raise OSError(message)
 
-        hook_class = load_plugin_from_script(path, build_script, BuilderInterface, 'builder')  # type: ignore
+        hook_class = load_plugin_from_script(path, build_script, BuilderInterface, 'builder')  # type: ignore[type-abstract]
         hook = hook_class(root, plugin_manager=plugin_manager, config=config, metadata=metadata, app=app)
 
         # Always keep the name to avoid confusion

backend/src/hatchling/builders/hooks/custom.py

@@ -11,7 +11,7 @@
 class CustomBuildHook:
     PLUGIN_NAME = 'custom'
 
-    def __new__(  # type: ignore
+    def __new__(  # type: ignore[misc]
         cls,
         root: str,
         config: dict[str, Any],

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

@@ -12,4 +12,4 @@
 
 @hookimpl
 def hatch_register_build_hook() -> list[type[BuildHookInterface]]:
-    return [CustomBuildHook, VersionBuildHook]  # type: ignore
+    return [CustomBuildHook, VersionBuildHook]  # type: ignore[list-item]

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

@@ -15,4 +15,4 @@
 
 @hookimpl
 def hatch_register_builder() -> list[type[BuilderInterface]]:
-    return [AppBuilder, BinaryBuilder, CustomBuilder, SdistBuilder, WheelBuilder]  # type: ignore
+    return [AppBuilder, BinaryBuilder, CustomBuilder, SdistBuilder, WheelBuilder]  # type: ignore[list-item]

backend/src/hatchling/cli/dep/core.py

@@ -126,7 +126,7 @@ def dependencies_in_sync(
     if sys_path is None:
         sys_path = sys.path
     if environment is None:
-        environment = default_environment()  # type: ignore
+        environment = default_environment()  # type: ignore[assignment]
 
     installed_distributions = DistributionCache(sys_path)
-    return all(dependency_in_sync(requirement, environment, installed_distributions) for requirement in requirements)  # type: ignore
+    return all(dependency_in_sync(requirement, environment, installed_distributions) for requirement in requirements)  # type: ignore[arg-type]

backend/src/hatchling/metadata/custom.py

@@ -11,7 +11,7 @@
 class CustomMetadataHook:
     PLUGIN_NAME = 'custom'
 
-    def __new__(  # type: ignore
+    def __new__(  # type: ignore[misc]
         cls,
         root: str,
         config: dict[str, Any],
@@ -32,7 +32,7 @@ def __new__(  # type: ignore
             message = f'Build script does not exist: {build_script}'
             raise OSError(message)
 
-        hook_class = load_plugin_from_script(path, build_script, MetadataHookInterface, 'metadata_hook')  # type: ignore
+        hook_class = load_plugin_from_script(path, build_script, MetadataHookInterface, 'metadata_hook')  # type: ignore[type-abstract]
         hook = hook_class(root, config, *args, **kwargs)
 
         # Always keep the name to avoid confusion

backend/src/hatchling/metadata/plugin/hooks.py

@@ -11,4 +11,4 @@
 
 @hookimpl
 def hatch_register_metadata_hook() -> type[MetadataHookInterface]:
-    return CustomMetadataHook  # type: ignore
+    return CustomMetadataHook  # type: ignore[return-value]

backend/src/hatchling/metadata/spec.py

@@ -67,7 +67,7 @@ def project_metadata_from_core_metadata(core_metadata: str) -> dict[str, Any]:
     header_registry = HeaderRegistry()
 
     message = email.message_from_string(core_metadata)
-    metadata = {}
+    metadata: dict[str, Any] = {}
 
     if name := message.get('Name'):
         metadata['name'] = name

backend/src/hatchling/plugin/utils.py

@@ -14,8 +14,8 @@ def load_plugin_from_script(path: str, script_name: str, plugin_class: type[T],
     from importlib.util import module_from_spec, spec_from_file_location
 
     spec = spec_from_file_location(script_name, path)
-    module = module_from_spec(spec)  # type: ignore
-    spec.loader.exec_module(module)  # type: ignore
+    module = module_from_spec(spec)  # type: ignore[arg-type]
+    spec.loader.exec_module(module)  # type: ignore[union-attr]
 
     plugin_finder = f'get_{plugin_id}'
     names = dir(module)

backend/src/hatchling/version/core.py

@@ -43,7 +43,7 @@ def read(self, *, pattern: str | bool) -> str:
         return self.__cached_read_data[0]
 
     def set_version(self, version: str) -> None:
-        _old_version, file_contents, (start, end) = self.__cached_read_data  # type: ignore
+        _old_version, file_contents, (start, end) = self.__cached_read_data  # type: ignore[misc]
         with open(self.__path, 'w', encoding='utf-8') as f:
             f.write(f'{file_contents[:start]}{version}{file_contents[end:]}')
 

backend/src/hatchling/version/source/code.py

@@ -45,12 +45,12 @@ def get_version_data(self) -> dict:
             absolute_search_paths.append(os.path.normpath(os.path.join(self.root, search_path)))
 
         spec = spec_from_file_location(os.path.splitext(path)[0], path)
-        module = module_from_spec(spec)  # type: ignore
+        module = module_from_spec(spec)  # type: ignore[arg-type]
 
         old_search_paths = list(sys.path)
         try:
             sys.path[:] = [*absolute_search_paths, *old_search_paths]
-            spec.loader.exec_module(module)  # type: ignore
+            spec.loader.exec_module(module)  # type: ignore[union-attr]
         finally:
             sys.path[:] = old_search_paths
 

pyproject.toml

@@ -90,11 +90,11 @@ exclude = [
 [tool.mypy]
 disallow_untyped_defs = false
 disallow_incomplete_defs = false
+enable_error_code = ["ignore-without-code", "truthy-bool"]
 follow_imports = "normal"
 ignore_missing_imports = true
 pretty = true
 show_column_numbers = true
-show_error_codes = true
 warn_no_return = false
 warn_unused_ignores = true
 

src/hatch/cli/terminal.py

@@ -42,8 +42,8 @@ def __init__(
         is_interactive: bool,
         verbosity: int,
         spinner_style: str,
-        waiting_style: Style,
-        success_style: Style,
+        waiting_style: Style | str,
+        success_style: Style | str,
         initializer: Callable,
         finalizer: Callable,
     ):
@@ -331,8 +331,8 @@ def status(self) -> BorrowedStatus:
             is_interactive=self.console.is_interactive,
             verbosity=self.verbosity,
             spinner_style=self._style_spinner,
-            waiting_style=self._style_level_waiting,  # type: ignore[arg-type]
-            success_style=self._style_level_success,  # type: ignore[arg-type]
+            waiting_style=self._style_level_waiting,
+            success_style=self._style_level_success,
             initializer=lambda: setattr(self.platform, 'displaying_status', True),  # type: ignore[attr-defined]
             finalizer=lambda: setattr(self.platform, 'displaying_status', False),  # type: ignore[attr-defined]
         )

src/hatch/dep/sync.py

@@ -126,7 +126,7 @@ def dependencies_in_sync(
     if sys_path is None:
         sys_path = sys.path
     if environment is None:
-        environment = default_environment()  # type: ignore
+        environment = default_environment()  # type: ignore[assignment]
 
     installed_distributions = DistributionCache(sys_path)
-    return all(dependency_in_sync(requirement, environment, installed_distributions) for requirement in requirements)  # type: ignore
+    return all(dependency_in_sync(requirement, environment, installed_distributions) for requirement in requirements)  # type: ignore[arg-type]

src/hatch/env/collectors/custom.py

@@ -11,7 +11,7 @@
 class CustomEnvironmentCollector:
     PLUGIN_NAME = 'custom'
 
-    def __new__(  # type: ignore
+    def __new__(  # type: ignore[misc]
         cls,
         root: str,
         config: dict[str, Any],

src/hatch/env/collectors/plugin/hooks.py

@@ -12,4 +12,4 @@
 
 @hookimpl
 def hatch_register_environment_collector() -> list[type[EnvironmentCollectorInterface]]:
-    return [CustomEnvironmentCollector, DefaultEnvironmentCollector]  # type: ignore
+    return [CustomEnvironmentCollector, DefaultEnvironmentCollector]  # type: ignore[list-item]

src/hatch/plugin/utils.py

@@ -12,8 +12,8 @@ def load_plugin_from_script(
     from importlib.util import module_from_spec, spec_from_file_location
 
     spec = spec_from_file_location(script_name, path)
-    module = module_from_spec(spec)  # type: ignore
-    spec.loader.exec_module(module)  # type: ignore
+    module = module_from_spec(spec)  # type: ignore[arg-type]
+    spec.loader.exec_module(module)  # type: ignore[union-attr]
 
     plugin_finder = f'get_{plugin_id}'
     names = dir(module)

src/hatch/utils/platform.py

@@ -176,7 +176,7 @@ def populate_default_popen_kwargs(self, kwargs: dict[str, Any], *, shell: bool)
     @staticmethod
     def stream_process_output(process: Popen) -> Iterable[str]:
         # To avoid blocking never use a pipe's file descriptor iterator. See https://bugs.python.org/issue3907
-        for line in iter(process.stdout.readline, b''):  # type: ignore
+        for line in iter(process.stdout.readline, b''):  # type: ignore[union-attr]
             yield line.decode('utf-8')
 
     @property