diff --git a/bin/generate_schema.py b/bin/generate_schema.py index a7007886..39012cdc 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -12,12 +12,9 @@ parser.add_argument("--schemastore", action="store_true", help="Generate schema_ args = parser.parse_args() starter = """ -$id: https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json $schema: http://json-schema.org/draft-07/schema -additionalProperties: false -description: cibuildwheel's settings. -type: object -defines: +$id: https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json +$defs: inherit: enum: - none @@ -25,6 +22,9 @@ defines: - append default: none description: How to inherit the parent's value. +additionalProperties: false +description: cibuildwheel's settings. +type: object properties: archs: description: Change the architectures built on your machine by default. @@ -223,17 +223,17 @@ items: type: object additionalProperties: false properties: - before-all: {"$ref": "#/defines/inherit"} - before-build: {"$ref": "#/defines/inherit"} - before-test: {"$ref": "#/defines/inherit"} - config-settings: {"$ref": "#/defines/inherit"} - container-engine: {"$ref": "#/defines/inherit"} - environment: {"$ref": "#/defines/inherit"} - environment-pass: {"$ref": "#/defines/inherit"} - repair-wheel-command: {"$ref": "#/defines/inherit"} - test-command: {"$ref": "#/defines/inherit"} - test-extras: {"$ref": "#/defines/inherit"} - test-requires: {"$ref": "#/defines/inherit"} + before-all: {"$ref": "#/$defs/inherit"} + before-build: {"$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-requires: {"$ref": "#/$defs/inherit"} """ ) diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 1dd89099..25cf64ba 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -1,10 +1,7 @@ { - "$id": "https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json", "$schema": "http://json-schema.org/draft-07/schema", - "additionalProperties": false, - "description": "cibuildwheel's settings.", - "type": "object", - "defines": { + "$id": "https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json", + "$defs": { "inherit": { "enum": [ "none", @@ -15,6 +12,9 @@ "description": "How to inherit the parent's value." } }, + "additionalProperties": false, + "description": "cibuildwheel's settings.", + "type": "object", "properties": { "archs": { "description": "Change the architectures built on your machine by default.", @@ -439,37 +439,37 @@ "additionalProperties": false, "properties": { "before-all": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "before-build": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "before-test": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "config-settings": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "container-engine": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "environment": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "environment-pass": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "repair-wheel-command": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "test-command": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "test-extras": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" }, "test-requires": { - "$ref": "#/defines/inherit" + "$ref": "#/$defs/inherit" } } },