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

pypa · Mar 12, 2024 · b3c4d37 · b3c4d37
1 parent 3eb6dbb
commit b3c4d37
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/bin/generate_schema.py b/bin/generate_schema.py
@@ -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.
@@ -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"}
 """
 )
 

diff --git 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"
               }
             }
           },