Skip to content

fix(schema): use $refs instead of defines #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henryiii merged 1 commit into from
Mar 12, 2024
Merged

fix(schema): use $refs instead of defines #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions bin/generate_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
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
- prepend
- 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.
Expand Down Expand Up @@ -223,17 +223,17 @@
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"}
"""
)

Expand Down
32 changes: 16 additions & 16 deletions cibuildwheel/resources/cibuildwheel.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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.",
Expand Down Expand Up @@ -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"
}
}
},
Expand Down