From 5fa52402f60bc8d0a05a9da65ac5c81c7a68e183 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 21 Dec 2023 17:12:09 -0500 Subject: [PATCH 1/4] refactor: move files to *-partial Signed-off-by: Henry Schreiner --- src/schemas/json/{cibuildwheel.json => partial-cibuildwheel.json} | 0 src/schemas/json/{poetry.json => partial-poetry.json} | 0 src/schemas/json/{scikit-build.json => partial-scikit-build.json} | 0 src/schemas/json/{setuptools.json => partial-setuptools.json} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename src/schemas/json/{cibuildwheel.json => partial-cibuildwheel.json} (100%) rename src/schemas/json/{poetry.json => partial-poetry.json} (100%) rename src/schemas/json/{scikit-build.json => partial-scikit-build.json} (100%) rename src/schemas/json/{setuptools.json => partial-setuptools.json} (100%) diff --git a/src/schemas/json/cibuildwheel.json b/src/schemas/json/partial-cibuildwheel.json similarity index 100% rename from src/schemas/json/cibuildwheel.json rename to src/schemas/json/partial-cibuildwheel.json diff --git a/src/schemas/json/poetry.json b/src/schemas/json/partial-poetry.json similarity index 100% rename from src/schemas/json/poetry.json rename to src/schemas/json/partial-poetry.json diff --git a/src/schemas/json/scikit-build.json b/src/schemas/json/partial-scikit-build.json similarity index 100% rename from src/schemas/json/scikit-build.json rename to src/schemas/json/partial-scikit-build.json diff --git a/src/schemas/json/setuptools.json b/src/schemas/json/partial-setuptools.json similarity index 100% rename from src/schemas/json/setuptools.json rename to src/schemas/json/partial-setuptools.json From 4f1546b9e9484f1ac111cd73d0f06092f6a2fd22 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 21 Dec 2023 17:46:02 -0500 Subject: [PATCH 2/4] refactor: remaining changes for moved files Signed-off-by: Henry Schreiner --- src/api/json/catalog.json | 24 + src/schema-validation.json | 46 +- src/schemas/json/cibuildwheel.json | 18 + src/schemas/json/partial-cibuildwheel.json | 1312 ++++++++++---------- src/schemas/json/partial-poetry.json | 2 +- src/schemas/json/partial-scikit-build.json | 2 +- src/schemas/json/partial-setuptools.json | 2 +- src/schemas/json/poetry.json | 5 + src/schemas/json/pyproject.json | 8 +- src/schemas/json/scikit-build.json | 5 + src/schemas/json/setuptools.json | 6 + 11 files changed, 757 insertions(+), 673 deletions(-) create mode 100644 src/schemas/json/cibuildwheel.json create mode 100644 src/schemas/json/poetry.json create mode 100644 src/schemas/json/scikit-build.json create mode 100644 src/schemas/json/setuptools.json diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json index 1a297316f67..2ad622f7b14 100644 --- a/src/api/json/catalog.json +++ b/src/api/json/catalog.json @@ -839,6 +839,12 @@ "fileMatch": ["cibuildwheel.toml", ".cibuildwheel.toml"], "url": "https://json.schemastore.org/cibuildwheel.json" }, + { + "name": "poartial-cibuildwheel", + "description": "cibuildwheel, a Python redistributable wheel builder", + "fileMatch": [], + "url": "https://json.schemastore.org/partial-cibuildwheel.json" + }, { "name": "CityJSON", "description": "the representation of 3D city models", @@ -3153,6 +3159,12 @@ "fileMatch": [], "url": "https://json.schemastore.org/poetry.json" }, + { + "name": "Partial-poetry", + "description": "Poetry, a Python packaging tool", + "fileMatch": [], + "url": "https://json.schemastore.org/partial-poetry.json" + }, { "name": "plagiarize.yaml", "description": "Yaml Plagiarize", @@ -3735,6 +3747,12 @@ "fileMatch": [], "url": "https://json.schemastore.org/setuptools.json" }, + { + "name": "Partial-Setuptools", + "description": "Setuptools, the classic Python buildsystem", + "fileMatch": [], + "url": "https://json.schemastore.org/partial-setuptools.json" + }, { "name": "sfdx-hardis configuration", "description": "Configuration file for sfdx-hardis Salesforce DX plugin", @@ -5057,6 +5075,12 @@ "fileMatch": [], "url": "https://json.schemastore.org/scikit-build.json" }, + { + "name": "partial-scikit-build", + "description": "Pyproject configuration for scikit-build-core", + "fileMatch": [], + "url": "https://json.schemastore.org/partial-scikit-build.json" + }, { "name": "StackHawk Scanner Configuration", "description": "StackHawk Scanner configuration files", diff --git a/src/schema-validation.json b/src/schema-validation.json index 73e80c2661a..ecd062f1f30 100644 --- a/src/schema-validation.json +++ b/src/schema-validation.json @@ -778,17 +778,53 @@ "unknownKeywords": ["x-taplo", "x-taplo-info"] } }, + { + "cibuildwheel.json": { + "externalSchema": [ + "partial-cibuildwheel.json" + ] + } + }, + { + "setuptools.json": { + "externalSchema": [ + "partial-setuptools.json" + ], + "unknownFormat": [ + "python-module-name", + "pep508-identifier", + "python-qualified-identifier", + "python-identifier", + "pep561-stub-name" + ] + } + }, + { + "scikit-build.json": { + "externalSchema": [ + "partial-scikit-build.json" + ] + } + }, + { + "poetry.json": { + "externalSchema": [ + "partial-poetry.json" + ] + } + }, { "pyproject.json": { "externalSchema": [ - "cibuildwheel.json", "hatch.json", + "partial-cibuildwheel.json", "partial-mypy.json", "partial-pdm.json", + "partial-poetry.json", + "partial-scikit-build.json", + "partial-setuptools.json", "poetry.json", - "ruff.json", - "scikit-build.json", - "setuptools.json" + "ruff.json" ], "unknownKeywords": ["x-taplo", "x-taplo-info"], "unknownFormat": [ @@ -825,7 +861,7 @@ } }, { - "setuptools.json": { + "partial-setuptools.json": { "unknownFormat": [ "python-module-name", "pep508-identifier", diff --git a/src/schemas/json/cibuildwheel.json b/src/schemas/json/cibuildwheel.json new file mode 100644 index 00000000000..fef7e5419ac --- /dev/null +++ b/src/schemas/json/cibuildwheel.json @@ -0,0 +1,18 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://json.schemastore.org/cibuildwheel.json", + "description": "cibuildwheel's toml file, uses the same source as pyproject.toml.", + "type": "object", + "additionalProperties": false, + "properties": { + "tool": { + "type": "object", + "additionalProperties": false, + "properties": { + "cibuildwheel": { + "$ref": "https://json.schemastore.org/partial-cibuildwheel.json" + } + } + } + } +} diff --git a/src/schemas/json/partial-cibuildwheel.json b/src/schemas/json/partial-cibuildwheel.json index f5536dafb18..a4bc81ee1f6 100644 --- a/src/schemas/json/partial-cibuildwheel.json +++ b/src/schemas/json/partial-cibuildwheel.json @@ -1,375 +1,139 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://json.schemastore.org/cibuildwheel.json", + "$id": "https://json.schemastore.org/partial-cibuildwheel.json", "description": "cibuildwheel's toml file, generated with ./bin/generate_schema.py --schemastore from cibuildwheel.", "type": "object", + "additionalProperties": false, "properties": { - "tool": { - "type": "object", - "properties": { - "cibuildwheel": { + "archs": { + "description": "Change the architectures built on your machine by default.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_ARCHS" + }, + "before-all": { + "description": "Execute a shell command on the build system before any wheels are built.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_BEFORE_ALL" + }, + "before-build": { + "description": "Execute a shell command preparing each wheel's build.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_BEFORE_BUILD" + }, + "before-test": { + "description": "Execute a shell command before testing each wheel.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_BEFORE_TEST" + }, + "build": { + "default": ["*"], + "description": "Choose the Python versions to build.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_BUILD" + }, + "build-frontend": { + "default": "default", + "description": "Set the tool to use to build, either \"pip\" (default for now) or \"build\"", + "oneOf": [ + { + "enum": ["pip", "build", "default"] + }, + { + "type": "string", + "pattern": "^pip; ?args:" + }, + { + "type": "string", + "pattern": "^build; ?args:" + }, + { "type": "object", "additionalProperties": false, + "required": ["name"], "properties": { - "archs": { - "description": "Change the architectures built on your machine by default.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_ARCHS" + "name": { + "enum": ["pip", "build"] }, - "before-all": { - "description": "Execute a shell command on the build system before any wheels are built.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_BEFORE_ALL" - }, - "before-build": { - "description": "Execute a shell command preparing each wheel's build.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_BEFORE_BUILD" - }, - "before-test": { - "description": "Execute a shell command before testing each wheel.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_BEFORE_TEST" - }, - "build": { - "default": ["*"], - "description": "Choose the Python versions to build.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_BUILD" - }, - "build-frontend": { - "default": "default", - "description": "Set the tool to use to build, either \"pip\" (default for now) or \"build\"", - "oneOf": [ - { - "enum": ["pip", "build", "default"] - }, - { - "type": "string", - "pattern": "^pip; ?args:" - }, - { - "type": "string", - "pattern": "^build; ?args:" - }, - { - "type": "object", - "additionalProperties": false, - "required": ["name"], - "properties": { - "name": { - "enum": ["pip", "build"] - }, - "args": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - ], - "title": "CIBW_BUILD_FRONTEND" - }, - "build-verbosity": { - "type": "integer", - "minimum": -3, - "maximum": 3, - "default": 0, - "description": "Increase/decrease the output of pip wheel.", - "title": "CIBW_BUILD_VERBOSITY" - }, - "config-settings": { - "description": "Specify config-settings for the build backend.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "object", - "additionalProperties": false, - "patternProperties": { - ".+": { - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ] - } - } - } - ], - "title": "CIBW_CONFIG_SETTINGS" - }, - "container-engine": { - "oneOf": [ - { - "enum": ["docker", "podman"] - }, - { - "type": "string", - "pattern": "^docker; ?create_args:" - }, - { - "type": "string", - "pattern": "^podman; ?create_args:" - }, - { - "type": "object", - "additionalProperties": false, - "required": ["name"], - "properties": { - "name": { - "enum": ["docker", "podman"] - }, - "create-args": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - ], - "title": "CIBW_CONTAINER_ENGINE" - }, - "dependency-versions": { - "default": "pinned", - "description": "Specify how cibuildwheel controls the versions of the tools it uses", - "type": "string", - "title": "CIBW_DEPENDENCY_VERSIONS" - }, - "environment": { - "description": "Set environment variables needed during the build.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "object", - "additionalProperties": false, - "patternProperties": { - ".+": { - "type": "string" - } - } - } - ], - "title": "CIBW_ENVIRONMENT" - }, - "environment-pass": { - "description": "Set environment variables on the host to pass-through to the container during the build.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_ENVIRONMENT_PASS" - }, - "manylinux-aarch64-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_AARCH64_IMAGE" - }, - "manylinux-i686-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_I686_IMAGE" - }, - "manylinux-ppc64le-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_PPC64LE_IMAGE" - }, - "manylinux-pypy_aarch64-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_PYPY_AARCH64_IMAGE" - }, - "manylinux-pypy_i686-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_PYPY_I686_IMAGE" - }, - "manylinux-pypy_x86_64-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_PYPY_X86_64_IMAGE" - }, - "manylinux-s390x-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_S390X_IMAGE" - }, - "manylinux-x86_64-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MANYLINUX_X86_64_IMAGE" - }, - "musllinux-aarch64-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MUSLLINUX_AARCH64_IMAGE" - }, - "musllinux-i686-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MUSLLINUX_I686_IMAGE" - }, - "musllinux-ppc64le-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MUSLLINUX_PPC64LE_IMAGE" - }, - "musllinux-s390x-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MUSLLINUX_S390X_IMAGE" - }, - "musllinux-x86_64-image": { - "type": "string", - "description": "Specify alternative manylinux / musllinux container images", - "title": "CIBW_MUSLLINUX_X86_64_IMAGE" - }, - "repair-wheel-command": { - "description": "Execute a shell command to repair each built wheel.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_REPAIR_WHEEL_COMMAND" - }, - "skip": { - "description": "Choose the Python versions to skip.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_SKIP" - }, - "test-command": { - "description": "Execute a shell command to test each built wheel.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_TEST_COMMAND" - }, - "test-extras": { - "description": "Install your wheel for testing using `extras_require`", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_TEST_EXTRAS" - }, - "test-requires": { - "description": "Install Python dependencies before running the tests", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_TEST_REQUIRES" - }, - "test-skip": { - "description": "Skip running tests on some builds.", + "args": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + ], + "title": "CIBW_BUILD_FRONTEND" + }, + "build-verbosity": { + "type": "integer", + "minimum": -3, + "maximum": 3, + "default": 0, + "description": "Increase/decrease the output of pip wheel.", + "title": "CIBW_BUILD_VERBOSITY" + }, + "config-settings": { + "description": "Specify config-settings for the build backend.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "object", + "additionalProperties": false, + "patternProperties": { + ".+": { "oneOf": [ { "type": "string" @@ -380,313 +144,539 @@ "type": "string" } } - ], - "title": "CIBW_TEST_SKIP" + ] + } + } + } + ], + "title": "CIBW_CONFIG_SETTINGS" + }, + "container-engine": { + "oneOf": [ + { + "enum": ["docker", "podman"] + }, + { + "type": "string", + "pattern": "^docker; ?create_args:" + }, + { + "type": "string", + "pattern": "^podman; ?create_args:" + }, + { + "type": "object", + "additionalProperties": false, + "required": ["name"], + "properties": { + "name": { + "enum": ["docker", "podman"] }, - "overrides": { + "create-args": { "type": "array", - "description": "An overrides array", "items": { - "type": "object", - "required": ["select"], - "minProperties": 2, - "additionalProperties": false, - "properties": { - "select": { - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ] - }, - "before-all": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-all" - }, - "before-build": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-build" - }, - "before-test": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-test" - }, - "build-frontend": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-frontend" - }, - "build-verbosity": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-verbosity" - }, - "config-settings": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/config-settings" - }, - "dependency-versions": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/dependency-versions" - }, - "environment": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/environment" - }, - "environment-pass": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/environment-pass" - }, - "manylinux-aarch64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-aarch64-image" - }, - "manylinux-i686-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-i686-image" - }, - "manylinux-ppc64le-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-ppc64le-image" - }, - "manylinux-pypy_aarch64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-pypy_aarch64-image" - }, - "manylinux-pypy_i686-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-pypy_i686-image" - }, - "manylinux-pypy_x86_64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-pypy_x86_64-image" - }, - "manylinux-s390x-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-s390x-image" - }, - "manylinux-x86_64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-x86_64-image" - }, - "musllinux-aarch64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-aarch64-image" - }, - "musllinux-i686-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-i686-image" - }, - "musllinux-ppc64le-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-ppc64le-image" - }, - "musllinux-s390x-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-s390x-image" - }, - "musllinux-x86_64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-x86_64-image" - }, - "repair-wheel-command": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/repair-wheel-command" - }, - "test-command": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-command" - }, - "test-extras": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-extras" - }, - "test-requires": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-requires" - } - } + "type": "string" } - }, - "linux": { - "type": "object", - "additionalProperties": false, - "properties": { - "archs": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/archs" - }, - "before-all": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-all" - }, - "before-build": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-build" - }, - "before-test": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-test" - }, - "build-frontend": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-frontend" - }, - "build-verbosity": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-verbosity" - }, - "config-settings": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/config-settings" - }, - "environment": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/environment" - }, - "environment-pass": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/environment-pass" - }, - "manylinux-aarch64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-aarch64-image" - }, - "manylinux-i686-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-i686-image" - }, - "manylinux-ppc64le-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-ppc64le-image" - }, - "manylinux-pypy_aarch64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-pypy_aarch64-image" - }, - "manylinux-pypy_i686-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-pypy_i686-image" - }, - "manylinux-pypy_x86_64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-pypy_x86_64-image" - }, - "manylinux-s390x-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-s390x-image" - }, - "manylinux-x86_64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/manylinux-x86_64-image" - }, - "musllinux-aarch64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-aarch64-image" - }, - "musllinux-i686-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-i686-image" - }, - "musllinux-ppc64le-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-ppc64le-image" - }, - "musllinux-s390x-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-s390x-image" - }, - "musllinux-x86_64-image": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/musllinux-x86_64-image" - }, - "repair-wheel-command": { - "description": "Execute a shell command to repair each built wheel.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_REPAIR_WHEEL_COMMAND", - "default": "auditwheel repair -w {dest_dir} {wheel}" - }, - "test-command": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-command" - }, - "test-extras": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-extras" - }, - "test-requires": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-requires" + } + } + } + ], + "title": "CIBW_CONTAINER_ENGINE" + }, + "dependency-versions": { + "default": "pinned", + "description": "Specify how cibuildwheel controls the versions of the tools it uses", + "type": "string", + "title": "CIBW_DEPENDENCY_VERSIONS" + }, + "environment": { + "description": "Set environment variables needed during the build.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "object", + "additionalProperties": false, + "patternProperties": { + ".+": { + "type": "string" + } + } + } + ], + "title": "CIBW_ENVIRONMENT" + }, + "environment-pass": { + "description": "Set environment variables on the host to pass-through to the container during the build.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_ENVIRONMENT_PASS" + }, + "manylinux-aarch64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_AARCH64_IMAGE" + }, + "manylinux-i686-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_I686_IMAGE" + }, + "manylinux-ppc64le-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_PPC64LE_IMAGE" + }, + "manylinux-pypy_aarch64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_PYPY_AARCH64_IMAGE" + }, + "manylinux-pypy_i686-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_PYPY_I686_IMAGE" + }, + "manylinux-pypy_x86_64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_PYPY_X86_64_IMAGE" + }, + "manylinux-s390x-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_S390X_IMAGE" + }, + "manylinux-x86_64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_X86_64_IMAGE" + }, + "musllinux-aarch64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MUSLLINUX_AARCH64_IMAGE" + }, + "musllinux-i686-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MUSLLINUX_I686_IMAGE" + }, + "musllinux-ppc64le-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MUSLLINUX_PPC64LE_IMAGE" + }, + "musllinux-s390x-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MUSLLINUX_S390X_IMAGE" + }, + "musllinux-x86_64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MUSLLINUX_X86_64_IMAGE" + }, + "repair-wheel-command": { + "description": "Execute a shell command to repair each built wheel.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_REPAIR_WHEEL_COMMAND" + }, + "skip": { + "description": "Choose the Python versions to skip.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_SKIP" + }, + "test-command": { + "description": "Execute a shell command to test each built wheel.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_TEST_COMMAND" + }, + "test-extras": { + "description": "Install your wheel for testing using `extras_require`", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_TEST_EXTRAS" + }, + "test-requires": { + "description": "Install Python dependencies before running the tests", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_TEST_REQUIRES" + }, + "test-skip": { + "description": "Skip running tests on some builds.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ], + "title": "CIBW_TEST_SKIP" + }, + "overrides": { + "type": "array", + "description": "An overrides array", + "items": { + "type": "object", + "required": ["select"], + "minProperties": 2, + "additionalProperties": false, + "properties": { + "select": { + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" } } - }, - "windows": { - "type": "object", - "additionalProperties": false, - "properties": { - "archs": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/archs" - }, - "before-all": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-all" - }, - "before-build": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-build" - }, - "before-test": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-test" - }, - "build-frontend": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-frontend" - }, - "build-verbosity": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-verbosity" - }, - "config-settings": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/config-settings" - }, - "dependency-versions": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/dependency-versions" - }, - "environment": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/environment" - }, - "repair-wheel-command": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/repair-wheel-command" - }, - "test-command": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-command" - }, - "test-extras": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-extras" - }, - "test-requires": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-requires" - } + ] + }, + "before-all": { + "$ref": "#/properties/before-all" + }, + "before-build": { + "$ref": "#/properties/before-build" + }, + "before-test": { + "$ref": "#/properties/before-test" + }, + "build-frontend": { + "$ref": "#/properties/build-frontend" + }, + "build-verbosity": { + "$ref": "#/properties/build-verbosity" + }, + "config-settings": { + "$ref": "#/properties/config-settings" + }, + "dependency-versions": { + "$ref": "#/properties/dependency-versions" + }, + "environment": { + "$ref": "#/properties/environment" + }, + "environment-pass": { + "$ref": "#/properties/environment-pass" + }, + "manylinux-aarch64-image": { + "$ref": "#/properties/manylinux-aarch64-image" + }, + "manylinux-i686-image": { + "$ref": "#/properties/manylinux-i686-image" + }, + "manylinux-ppc64le-image": { + "$ref": "#/properties/manylinux-ppc64le-image" + }, + "manylinux-pypy_aarch64-image": { + "$ref": "#/properties/manylinux-pypy_aarch64-image" + }, + "manylinux-pypy_i686-image": { + "$ref": "#/properties/manylinux-pypy_i686-image" + }, + "manylinux-pypy_x86_64-image": { + "$ref": "#/properties/manylinux-pypy_x86_64-image" + }, + "manylinux-s390x-image": { + "$ref": "#/properties/manylinux-s390x-image" + }, + "manylinux-x86_64-image": { + "$ref": "#/properties/manylinux-x86_64-image" + }, + "musllinux-aarch64-image": { + "$ref": "#/properties/musllinux-aarch64-image" + }, + "musllinux-i686-image": { + "$ref": "#/properties/musllinux-i686-image" + }, + "musllinux-ppc64le-image": { + "$ref": "#/properties/musllinux-ppc64le-image" + }, + "musllinux-s390x-image": { + "$ref": "#/properties/musllinux-s390x-image" + }, + "musllinux-x86_64-image": { + "$ref": "#/properties/musllinux-x86_64-image" + }, + "repair-wheel-command": { + "$ref": "#/properties/repair-wheel-command" + }, + "test-command": { + "$ref": "#/properties/test-command" + }, + "test-extras": { + "$ref": "#/properties/test-extras" + }, + "test-requires": { + "$ref": "#/properties/test-requires" + } + } + } + }, + "linux": { + "type": "object", + "additionalProperties": false, + "properties": { + "archs": { + "$ref": "#/properties/archs" + }, + "before-all": { + "$ref": "#/properties/before-all" + }, + "before-build": { + "$ref": "#/properties/before-build" + }, + "before-test": { + "$ref": "#/properties/before-test" + }, + "build-frontend": { + "$ref": "#/properties/build-frontend" + }, + "build-verbosity": { + "$ref": "#/properties/build-verbosity" + }, + "config-settings": { + "$ref": "#/properties/config-settings" + }, + "environment": { + "$ref": "#/properties/environment" + }, + "environment-pass": { + "$ref": "#/properties/environment-pass" + }, + "manylinux-aarch64-image": { + "$ref": "#/properties/manylinux-aarch64-image" + }, + "manylinux-i686-image": { + "$ref": "#/properties/manylinux-i686-image" + }, + "manylinux-ppc64le-image": { + "$ref": "#/properties/manylinux-ppc64le-image" + }, + "manylinux-pypy_aarch64-image": { + "$ref": "#/properties/manylinux-pypy_aarch64-image" + }, + "manylinux-pypy_i686-image": { + "$ref": "#/properties/manylinux-pypy_i686-image" + }, + "manylinux-pypy_x86_64-image": { + "$ref": "#/properties/manylinux-pypy_x86_64-image" + }, + "manylinux-s390x-image": { + "$ref": "#/properties/manylinux-s390x-image" + }, + "manylinux-x86_64-image": { + "$ref": "#/properties/manylinux-x86_64-image" + }, + "musllinux-aarch64-image": { + "$ref": "#/properties/musllinux-aarch64-image" + }, + "musllinux-i686-image": { + "$ref": "#/properties/musllinux-i686-image" + }, + "musllinux-ppc64le-image": { + "$ref": "#/properties/musllinux-ppc64le-image" + }, + "musllinux-s390x-image": { + "$ref": "#/properties/musllinux-s390x-image" + }, + "musllinux-x86_64-image": { + "$ref": "#/properties/musllinux-x86_64-image" + }, + "repair-wheel-command": { + "description": "Execute a shell command to repair each built wheel.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" } - }, - "macos": { - "type": "object", - "additionalProperties": false, - "properties": { - "archs": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/archs" - }, - "before-all": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-all" - }, - "before-build": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-build" - }, - "before-test": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/before-test" - }, - "build-frontend": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-frontend" - }, - "build-verbosity": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/build-verbosity" - }, - "config-settings": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/config-settings" - }, - "dependency-versions": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/dependency-versions" - }, - "environment": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/environment" - }, - "repair-wheel-command": { - "description": "Execute a shell command to repair each built wheel.", - "oneOf": [ - { - "type": "string" - }, - { - "type": "array", - "items": { - "type": "string" - } - } - ], - "title": "CIBW_REPAIR_WHEEL_COMMAND", - "default": "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" - }, - "test-command": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-command" - }, - "test-extras": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-extras" - }, - "test-requires": { - "$ref": "#/properties/tool/properties/cibuildwheel/properties/test-requires" - } + } + ], + "title": "CIBW_REPAIR_WHEEL_COMMAND", + "default": "auditwheel repair -w {dest_dir} {wheel}" + }, + "test-command": { + "$ref": "#/properties/test-command" + }, + "test-extras": { + "$ref": "#/properties/test-extras" + }, + "test-requires": { + "$ref": "#/properties/test-requires" + } + } + }, + "windows": { + "type": "object", + "additionalProperties": false, + "properties": { + "archs": { + "$ref": "#/properties/archs" + }, + "before-all": { + "$ref": "#/properties/before-all" + }, + "before-build": { + "$ref": "#/properties/before-build" + }, + "before-test": { + "$ref": "#/properties/before-test" + }, + "build-frontend": { + "$ref": "#/properties/build-frontend" + }, + "build-verbosity": { + "$ref": "#/properties/build-verbosity" + }, + "config-settings": { + "$ref": "#/properties/config-settings" + }, + "dependency-versions": { + "$ref": "#/properties/dependency-versions" + }, + "environment": { + "$ref": "#/properties/environment" + }, + "repair-wheel-command": { + "$ref": "#/properties/repair-wheel-command" + }, + "test-command": { + "$ref": "#/properties/test-command" + }, + "test-extras": { + "$ref": "#/properties/test-extras" + }, + "test-requires": { + "$ref": "#/properties/test-requires" + } + } + }, + "macos": { + "type": "object", + "additionalProperties": false, + "properties": { + "archs": { + "$ref": "#/properties/archs" + }, + "before-all": { + "$ref": "#/properties/before-all" + }, + "before-build": { + "$ref": "#/properties/before-build" + }, + "before-test": { + "$ref": "#/properties/before-test" + }, + "build-frontend": { + "$ref": "#/properties/build-frontend" + }, + "build-verbosity": { + "$ref": "#/properties/build-verbosity" + }, + "config-settings": { + "$ref": "#/properties/config-settings" + }, + "dependency-versions": { + "$ref": "#/properties/dependency-versions" + }, + "environment": { + "$ref": "#/properties/environment" + }, + "repair-wheel-command": { + "description": "Execute a shell command to repair each built wheel.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" } } - } + ], + "title": "CIBW_REPAIR_WHEEL_COMMAND", + "default": "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" + }, + "test-command": { + "$ref": "#/properties/test-command" + }, + "test-extras": { + "$ref": "#/properties/test-extras" + }, + "test-requires": { + "$ref": "#/properties/test-requires" } } } diff --git a/src/schemas/json/partial-poetry.json b/src/schemas/json/partial-poetry.json index 5cb41317549..1ee24363233 100644 --- a/src/schemas/json/partial-poetry.json +++ b/src/schemas/json/partial-poetry.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://json.schemastore.org/poetry.json", + "$id": "https://json.schemastore.org/partial-poetry.json", "definitions": { "poetry-author-pattern": { "description": "Pattern that matches `Name ` like 'King Arthur' or 'Miss Islington <miss-islington@python.org>'.", diff --git a/src/schemas/json/partial-scikit-build.json b/src/schemas/json/partial-scikit-build.json index b2eb262bd20..b732f6a7c0c 100644 --- a/src/schemas/json/partial-scikit-build.json +++ b/src/schemas/json/partial-scikit-build.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://json.schemastore.org/scikit-build.json", + "$id": "https://json.schemastore.org/partial-scikit-build.json", "$defs": { "metadata": { "type": "object", diff --git a/src/schemas/json/partial-setuptools.json b/src/schemas/json/partial-setuptools.json index 69e1d9263d9..6530021d398 100644 --- a/src/schemas/json/partial-setuptools.json +++ b/src/schemas/json/partial-setuptools.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://json.schemastore.org/setuptools.json", + "$id": "https://json.schemastore.org/partial-setuptools.json", "title": "``tool.setuptools`` table", "type": "object", "additionalProperties": false, diff --git a/src/schemas/json/poetry.json b/src/schemas/json/poetry.json new file mode 100644 index 00000000000..e1e55880aa0 --- /dev/null +++ b/src/schemas/json/poetry.json @@ -0,0 +1,5 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://json.schemastore.org/poetry.json", + "$ref": "https://json.schemastore.org/partial-poetry.json" +} diff --git a/src/schemas/json/pyproject.json b/src/schemas/json/pyproject.json index e4a551be887..9d117d4ff9d 100644 --- a/src/schemas/json/pyproject.json +++ b/src/schemas/json/pyproject.json @@ -100,7 +100,7 @@ }, "properties": { "cibuildwheel": { - "$ref": "https://json.schemastore.org/cibuildwheel.json#/properties/tool/properties/cibuildwheel" + "$ref": "https://json.schemastore.org/partial-cibuildwheel.json" }, "mypy": { "$ref": "https://json.schemastore.org/partial-mypy.json" @@ -112,13 +112,13 @@ "$ref": "https://json.schemastore.org/hatch.json" }, "scikit-build": { - "$ref": "https://json.schemastore.org/scikit-build.json" + "$ref": "https://json.schemastore.org/partial-scikit-build.json" }, "setuptools": { - "$ref": "https://json.schemastore.org/setuptools.json" + "$ref": "https://json.schemastore.org/partial-setuptools.json" }, "poetry": { - "$ref": "https://json.schemastore.org/poetry.json" + "$ref": "https://json.schemastore.org/partial-poetry.json" }, "pdm": { "$ref": "https://json.schemastore.org/partial-pdm.json" diff --git a/src/schemas/json/scikit-build.json b/src/schemas/json/scikit-build.json new file mode 100644 index 00000000000..3ea6f16afd9 --- /dev/null +++ b/src/schemas/json/scikit-build.json @@ -0,0 +1,5 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://json.schemastore.org/scikit-build.json", + "$ref": "https://json.schemastore.org/partial-scikit-build.json" +} diff --git a/src/schemas/json/setuptools.json b/src/schemas/json/setuptools.json new file mode 100644 index 00000000000..1856f3e947c --- /dev/null +++ b/src/schemas/json/setuptools.json @@ -0,0 +1,6 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://json.schemastore.org/setuptools.json", + "$ref": "https://json.schemastore.org/partial-setuptools.json" +} + From 551f70ae6dc0588c573f6673d2f191ddae181028 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 22:54:03 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/schema-validation.json | 16 ++++------------ src/schemas/json/setuptools.json | 1 - 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/schema-validation.json b/src/schema-validation.json index ecd062f1f30..076a2adfbe1 100644 --- a/src/schema-validation.json +++ b/src/schema-validation.json @@ -780,16 +780,12 @@ }, { "cibuildwheel.json": { - "externalSchema": [ - "partial-cibuildwheel.json" - ] + "externalSchema": ["partial-cibuildwheel.json"] } }, { "setuptools.json": { - "externalSchema": [ - "partial-setuptools.json" - ], + "externalSchema": ["partial-setuptools.json"], "unknownFormat": [ "python-module-name", "pep508-identifier", @@ -801,16 +797,12 @@ }, { "scikit-build.json": { - "externalSchema": [ - "partial-scikit-build.json" - ] + "externalSchema": ["partial-scikit-build.json"] } }, { "poetry.json": { - "externalSchema": [ - "partial-poetry.json" - ] + "externalSchema": ["partial-poetry.json"] } }, { diff --git a/src/schemas/json/setuptools.json b/src/schemas/json/setuptools.json index 1856f3e947c..67a108b2b8d 100644 --- a/src/schemas/json/setuptools.json +++ b/src/schemas/json/setuptools.json @@ -3,4 +3,3 @@ "$id": "https://json.schemastore.org/setuptools.json", "$ref": "https://json.schemastore.org/partial-setuptools.json" } - From d187b235fdec3fcb177a7ef03fd25fca0d6d3a73 Mon Sep 17 00:00:00 2001 From: Edwin Kofler Date: Fri, 22 Dec 2023 06:05:50 -0800 Subject: [PATCH 4/4] typo --- src/api/json/catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json index 2ad622f7b14..115b1f30840 100644 --- a/src/api/json/catalog.json +++ b/src/api/json/catalog.json @@ -840,7 +840,7 @@ "url": "https://json.schemastore.org/cibuildwheel.json" }, { - "name": "poartial-cibuildwheel", + "name": "partial-cibuildwheel", "description": "cibuildwheel, a Python redistributable wheel builder", "fileMatch": [], "url": "https://json.schemastore.org/partial-cibuildwheel.json"