Move wheel.repair to be a section

Signed-off-by: Cristian Le <[email protected]>

Author: LecrisUT

README.md

@@ -258,7 +258,7 @@ wheel.exclude = []
 wheel.build-tag = ""
 
 # EXPERIMENTAL: Do automatic repairs of the compiled binaries and libraries.
-wheel.repair = false
+wheel.repair.enable = false
 
 # If CMake is less than this value, backport a copy of FindPython. Set to 0
 # disable this, or the empty string.

src/scikit_build_core/build/wheel.py

@@ -488,7 +488,7 @@ def _build_wheel_impl_impl(
             ),
             wheel_dirs["metadata"],
         ) as wheel:
-            if cmake is not None and settings.wheel.repair:
+            if cmake is not None and settings.wheel.repair.enable:
                 repairer = WheelRepairer.get_wheel_repairer(
                     wheel=wheel,
                     builder=builder,

src/scikit_build_core/builder/get_requires.py

@@ -147,7 +147,7 @@ def other_dynamic_requires(self) -> Generator[str, None, None]:
                 )
             )
 
-        if self.settings.wheel.repair:
+        if self.settings.wheel.repair.enable:
             platform_system = platform.system()
             if platform_system == "Linux":
                 yield "auditwheel"

src/scikit_build_core/resources/scikit-build.schema.json

@@ -241,9 +241,16 @@
           "description": "The build tag to use for the wheel. If empty, no build tag is used."
         },
         "repair": {
-          "type": "boolean",
-          "default": false,
-          "description": "EXPERIMENTAL: Do automatic repairs of the compiled binaries and libraries."
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "enable": {
+              "type": "boolean",
+              "default": false,
+              "description": "EXPERIMENTAL: Do automatic repairs of the compiled binaries and libraries."
+            }
+          },
+          "description": "Wheel repair options"
         }
       }
     },
@@ -571,6 +578,9 @@
                   },
                   "exclude": {
                     "$ref": "#/$defs/inherit"
+                  },
+                  "repair": {
+                    "$ref": "#/$defs/inherit"
                   }
                 }
               },

src/scikit_build_core/settings/skbuild_model.py

@@ -172,6 +172,14 @@ class SDistSettings:
     """
 
 
+@dataclasses.dataclass
+class WheelRepair:
+    enable: bool = False
+    """
+    EXPERIMENTAL: Do automatic repairs of the compiled binaries and libraries.
+    """
+
+
 @dataclasses.dataclass
 class WheelSettings:
     packages: Optional[Union[List[str], Dict[str, str]]] = None
@@ -239,9 +247,9 @@ class WheelSettings:
     The build tag to use for the wheel. If empty, no build tag is used.
     """
 
-    repair: bool = False
+    repair: WheelRepair = dataclasses.field(default_factory=WheelRepair)
     """
-    EXPERIMENTAL: Do automatic repairs of the compiled binaries and libraries.
+    Wheel repair options
     """
 
 

tests/packages/repair_wheel/pyproject.toml

@@ -10,12 +10,12 @@ dependencies = ["base_project"]
 [tool.scikit-build]
 build.requires = ["base_project @ {root:uri}/extern"]
 wheel.install-dir = "repair_wheel"
-wheel.repair = true
+wheel.repair.enable = true
 
 [project.scripts]
 main = "repair_wheel.__main__:run"
 
 [[tool.scikit-build.overrides]]
 if.env.MANUAL = true
-wheel.repair = false
+wheel.repair.enable = false
 cmake.define.DO_MANUAL_REPAIR = true