From 04709b1bfede02094939e9dfdad775c57a09bc31 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 12 Aug 2026 09:11:03 +0100 Subject: [PATCH] update schema --- bin/generate_schema.py | 44 +++--- .../resources/cibuildwheel.schema.json | 138 ++++++++++-------- 2 files changed, 102 insertions(+), 80 deletions(-) diff --git a/bin/generate_schema.py b/bin/generate_schema.py index ad830496..e98f41b8 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -40,6 +40,28 @@ additionalProperties: false description: cibuildwheel's settings. type: object properties: + inherit: + type: object + additionalProperties: false + properties: + audit-command: {"$ref": "#/$defs/inherit"} + audit-requires: {"$ref": "#/$defs/inherit"} + before-all: {"$ref": "#/$defs/inherit"} + before-build: {"$ref": "#/$defs/inherit"} + xbuild-tools: {"$ref": "#/$defs/inherit"} + xbuild-files: {"$ref": "#/$defs/inherit"} + before-test: {"$ref": "#/$defs/inherit"} + config-settings: {"$ref": "#/$defs/inherit"} + container-engine: {"$ref": "#/$defs/inherit"} + environment: {"$ref": "#/$defs/inherit"} + environment-pass: {"$ref": "#/$defs/inherit"} + repair-wheel-command: {"$ref": "#/$defs/inherit"} + test-command: {"$ref": "#/$defs/inherit"} + test-extras: {"$ref": "#/$defs/inherit"} + test-sources: {"$ref": "#/$defs/inherit"} + test-requires: {"$ref": "#/$defs/inherit"} + test-environment: {"$ref": "#/$defs/inherit"} + test-runtime: {"$ref": "#/$defs/inherit"} audit-command: description: Execute a shell command to audit each wheel after it is repaired. Use {wheel} for each wheel path, or {abi3_wheel} to only audit abi3 wheels. type: string_array @@ -315,28 +337,6 @@ items: additionalProperties: false properties: select: {} - inherit: - type: object - additionalProperties: false - properties: - audit-command: {"$ref": "#/$defs/inherit"} - audit-requires: {"$ref": "#/$defs/inherit"} - before-all: {"$ref": "#/$defs/inherit"} - before-build: {"$ref": "#/$defs/inherit"} - xbuild-tools: {"$ref": "#/$defs/inherit"} - xbuild-files: {"$ref": "#/$defs/inherit"} - before-test: {"$ref": "#/$defs/inherit"} - config-settings: {"$ref": "#/$defs/inherit"} - container-engine: {"$ref": "#/$defs/inherit"} - environment: {"$ref": "#/$defs/inherit"} - environment-pass: {"$ref": "#/$defs/inherit"} - repair-wheel-command: {"$ref": "#/$defs/inherit"} - test-command: {"$ref": "#/$defs/inherit"} - test-extras: {"$ref": "#/$defs/inherit"} - test-sources: {"$ref": "#/$defs/inherit"} - test-requires: {"$ref": "#/$defs/inherit"} - test-environment: {"$ref": "#/$defs/inherit"} - test-runtime: {"$ref": "#/$defs/inherit"} """ ) diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 5795aa2b..7bce36d3 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -26,6 +26,67 @@ "description": "cibuildwheel's settings.", "type": "object", "properties": { + "inherit": { + "type": "object", + "additionalProperties": false, + "properties": { + "audit-command": { + "$ref": "#/$defs/inherit" + }, + "audit-requires": { + "$ref": "#/$defs/inherit" + }, + "before-all": { + "$ref": "#/$defs/inherit" + }, + "before-build": { + "$ref": "#/$defs/inherit" + }, + "xbuild-tools": { + "$ref": "#/$defs/inherit" + }, + "xbuild-files": { + "$ref": "#/$defs/inherit" + }, + "before-test": { + "$ref": "#/$defs/inherit" + }, + "config-settings": { + "$ref": "#/$defs/inherit" + }, + "container-engine": { + "$ref": "#/$defs/inherit" + }, + "environment": { + "$ref": "#/$defs/inherit" + }, + "environment-pass": { + "$ref": "#/$defs/inherit" + }, + "repair-wheel-command": { + "$ref": "#/$defs/inherit" + }, + "test-command": { + "$ref": "#/$defs/inherit" + }, + "test-extras": { + "$ref": "#/$defs/inherit" + }, + "test-sources": { + "$ref": "#/$defs/inherit" + }, + "test-requires": { + "$ref": "#/$defs/inherit" + }, + "test-environment": { + "$ref": "#/$defs/inherit" + }, + "test-runtime": { + "$ref": "#/$defs/inherit" + } + }, + "title": "CIBW_INHERIT" + }, "audit-command": { "description": "Execute a shell command to audit each wheel after it is repaired. Use {wheel} for each wheel path, or {abi3_wheel} to only audit abi3 wheels.", "oneOf": [ @@ -689,64 +750,7 @@ ] }, "inherit": { - "type": "object", - "additionalProperties": false, - "properties": { - "audit-command": { - "$ref": "#/$defs/inherit" - }, - "audit-requires": { - "$ref": "#/$defs/inherit" - }, - "before-all": { - "$ref": "#/$defs/inherit" - }, - "before-build": { - "$ref": "#/$defs/inherit" - }, - "xbuild-tools": { - "$ref": "#/$defs/inherit" - }, - "xbuild-files": { - "$ref": "#/$defs/inherit" - }, - "before-test": { - "$ref": "#/$defs/inherit" - }, - "config-settings": { - "$ref": "#/$defs/inherit" - }, - "container-engine": { - "$ref": "#/$defs/inherit" - }, - "environment": { - "$ref": "#/$defs/inherit" - }, - "environment-pass": { - "$ref": "#/$defs/inherit" - }, - "repair-wheel-command": { - "$ref": "#/$defs/inherit" - }, - "test-command": { - "$ref": "#/$defs/inherit" - }, - "test-extras": { - "$ref": "#/$defs/inherit" - }, - "test-sources": { - "$ref": "#/$defs/inherit" - }, - "test-requires": { - "$ref": "#/$defs/inherit" - }, - "test-environment": { - "$ref": "#/$defs/inherit" - }, - "test-runtime": { - "$ref": "#/$defs/inherit" - } - } + "$ref": "#/properties/inherit" }, "audit-command": { "$ref": "#/properties/audit-command" @@ -875,6 +879,9 @@ "type": "object", "additionalProperties": false, "properties": { + "inherit": { + "$ref": "#/properties/inherit" + }, "audit-command": { "$ref": "#/properties/audit-command" }, @@ -1014,6 +1021,9 @@ "type": "object", "additionalProperties": false, "properties": { + "inherit": { + "$ref": "#/properties/inherit" + }, "audit-command": { "$ref": "#/properties/audit-command" }, @@ -1099,6 +1109,9 @@ "type": "object", "additionalProperties": false, "properties": { + "inherit": { + "$ref": "#/properties/inherit" + }, "audit-command": { "$ref": "#/properties/audit-command" }, @@ -1184,6 +1197,9 @@ "type": "object", "additionalProperties": false, "properties": { + "inherit": { + "$ref": "#/properties/inherit" + }, "audit-command": { "$ref": "#/properties/audit-command" }, @@ -1256,6 +1272,9 @@ "type": "object", "additionalProperties": false, "properties": { + "inherit": { + "$ref": "#/properties/inherit" + }, "audit-command": { "$ref": "#/properties/audit-command" }, @@ -1341,6 +1360,9 @@ "type": "object", "additionalProperties": false, "properties": { + "inherit": { + "$ref": "#/properties/inherit" + }, "audit-command": { "$ref": "#/properties/audit-command" },