Bugfix for CLI overriding, add skip option

Author: timkpaine

hatch_cpp/config.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from logging import getLogger
 from os import system as system_call
 from pathlib import Path
 from typing import List, Optional
 
+from pkn import getSimpleLogger
 from pydantic import BaseModel, Field, model_validator
 
 from .toolchains import BuildType, HatchCppCmakeConfiguration, HatchCppLibrary, HatchCppPlatform, HatchCppVcpkgConfiguration, Toolchain
@@ -15,13 +15,14 @@
 )
 
 
-_log = getLogger(__name__)
+log = getSimpleLogger("hatch_cpp")
 
 
 class HatchCppBuildConfig(BaseModel):
     """Build config values for Hatch C++ Builder."""
 
     verbose: Optional[bool] = Field(default=False)
+    skip: Optional[bool] = Field(default=False)
     name: Optional[str] = Field(default=None)
     libraries: List[HatchCppLibrary] = Field(default_factory=list)
     cmake: Optional[HatchCppCmakeConfiguration] = Field(default=None)
@@ -76,7 +77,7 @@ def generate(self):
 
         if "vanilla" in self._active_toolchains:
             if "vcpkg" in self._active_toolchains:
-                _log.warning("vcpkg toolchain is active; ensure that your compiler is configured to use vcpkg includes and libs.")
+                log.warning("vcpkg toolchain is active; ensure that your compiler is configured to use vcpkg includes and libs.")
 
             for library in self.libraries:
                 compile_flags = self.platform.get_compile_flags(library, self.build_type)

hatch_cpp/plugin.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from logging import getLogger
-from os import getenv
 from pathlib import Path
 from platform import machine as platform_machine
 from sys import platform as sys_platform, version_info
@@ -10,7 +8,7 @@
 from hatch_build import parse_extra_args_model
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
 
-from .config import HatchCppBuildConfig, HatchCppBuildPlan
+from .config import HatchCppBuildConfig, HatchCppBuildPlan, log
 from .utils import import_string
 
 __all__ = ("HatchCppBuildHook",)
@@ -20,7 +18,7 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
     """The hatch-cpp build hook."""
 
     PLUGIN_NAME = "hatch-cpp"
-    _logger = getLogger(__name__)
+    _logger = log
 
     def initialize(self, version: str, build_data: dict[str, Any]) -> None:
         """Initialize the plugin."""
@@ -35,12 +33,6 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
             self._logger.info("ignoring target name %s", self.target_name)
             return
 
-        # Skip if SKIP_HATCH_CPP is set
-        # TODO: Support CLI once https://github.com/pypa/hatch/pull/1743
-        if getenv("SKIP_HATCH_CPP"):
-            self._logger.info("Skipping the build hook since SKIP_HATCH_CPP was set")
-            return
-
         # Get build config class or use default
         build_config_class = import_string(self.config["build-config-class"]) if "build-config-class" in self.config else HatchCppBuildConfig
 
@@ -60,10 +52,14 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
         build_plan.generate()
 
         # Log commands if in verbose mode
-        if config.verbose:
+        if build_plan.verbose:
             for command in build_plan.commands:
                 self._logger.warning(command)
 
+        if build_plan.skip:
+            self._logger.warning("Skipping build")
+            return
+
         # Execute build plan
         build_plan.execute()
 
@@ -114,4 +110,4 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
                     build_data["force_include"][str(path)] = str(path)
 
         for path in build_data["force_include"]:
-            self._logger.warning(f"Force include: {path}")
+            self._logger.info(f"Force include: {path}")