From 827eff06f24ab3b84635e74faca0ca363729f747 Mon Sep 17 00:00:00 2001 From: Joel Rosario Date: Fri, 6 Mar 2026 01:27:23 +0530 Subject: [PATCH 1/5] Support for mTLS in Specmatic config (#5442) Co-authored-by: joelrosario --- src/schemas/json/specmatic.json | 33 +++++++++--- src/test/specmatic/specmatic-v2-mtls.json | 28 ++++++++++ src/test/specmatic/specmatic-v3-mtls.json | 64 +++++++++++++++++++++++ 3 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 src/test/specmatic/specmatic-v2-mtls.json create mode 100644 src/test/specmatic/specmatic-v3-mtls.json diff --git a/src/schemas/json/specmatic.json b/src/schemas/json/specmatic.json index 25e50633778..7be2256f061 100644 --- a/src/schemas/json/specmatic.json +++ b/src/schemas/json/specmatic.json @@ -552,6 +552,9 @@ "strictMode": { "type": ["boolean", "null"], "description": "Whether to enable strict mode for contract testing" + }, + "https": { + "$ref": "#/definitions/CertConfiguration" } } }, @@ -599,6 +602,9 @@ "strictMode": { "type": ["boolean", "null"], "description": "Whether to enable strict mode for stubbing" + }, + "https": { + "$ref": "#/definitions/CertConfiguration" } } }, @@ -969,15 +975,24 @@ "type": "object", "additionalProperties": false, "properties": { - "$ref": { "type": "string" }, + "$ref": { + "type": "string" + }, "definitions": { "$ref": "#/definitions/SpecificationStaticDefinitionArray" }, - - "description": { "type": "string" }, - "runOptions": { "$ref": "#/definitions/TestRunOptionsOrRef" }, - "data": { "$ref": "#/definitions/DataDefinition" }, - "settings": { "$ref": "#/definitions/TestSettingsOrRef" } + "description": { + "type": "string" + }, + "runOptions": { + "$ref": "#/definitions/TestRunOptionsOrRef" + }, + "data": { + "$ref": "#/definitions/DataDefinition" + }, + "settings": { + "$ref": "#/definitions/TestSettingsOrRef" + } }, "oneOf": [ { @@ -1834,6 +1849,9 @@ "actuatorUrl": { "$ref": "#/definitions/SubstitutableString" }, + "cert": { + "$ref": "#/definitions/CertConfigurationOrRef" + }, "specs": { "$ref": "#/definitions/OpenApiSpecificationRuntimeDefinitionArray" } @@ -2152,6 +2170,9 @@ }, "keyStorePassword": { "$ref": "#/definitions/SubstitutableString" + }, + "mtlsEnabled": { + "$ref": "#/definitions/SubstitutableBoolean" } } }, diff --git a/src/test/specmatic/specmatic-v2-mtls.json b/src/test/specmatic/specmatic-v2-mtls.json new file mode 100644 index 00000000000..75dcc230cd3 --- /dev/null +++ b/src/test/specmatic/specmatic-v2-mtls.json @@ -0,0 +1,28 @@ +{ + "contracts": [ + { + "filesystem": { + "directory": "./contracts" + }, + "provides": ["./contracts/petstore.yaml"] + } + ], + "stub": { + "https": { + "keyStore": { + "file": "./certs/server.jks" + }, + "keyStorePassword": "server-store-pass", + "mtlsEnabled": true + } + }, + "test": { + "https": { + "keyStore": { + "file": "./certs/client.jks" + }, + "keyStorePassword": "client-store-pass" + } + }, + "version": 2 +} diff --git a/src/test/specmatic/specmatic-v3-mtls.json b/src/test/specmatic/specmatic-v3-mtls.json new file mode 100644 index 00000000000..3089ad5ddc3 --- /dev/null +++ b/src/test/specmatic/specmatic-v3-mtls.json @@ -0,0 +1,64 @@ +{ + "dependencies": { + "services": [ + { + "service": { + "definitions": [ + { + "definition": { + "source": { + "filesystem": { + "directory": "./specs" + } + }, + "specs": ["order.yaml"] + } + } + ], + "runOptions": { + "openapi": { + "cert": { + "keyStore": { + "file": "./certs/server.jks" + }, + "keyStorePassword": "server-store-pass", + "mtlsEnabled": true + }, + "host": "localhost", + "port": 9443, + "type": "mock" + } + } + } + } + ] + }, + "systemUnderTest": { + "service": { + "definitions": [ + { + "definition": { + "source": { + "filesystem": { + "directory": "./specs" + } + }, + "specs": ["order.yaml"] + } + } + ], + "runOptions": { + "openapi": { + "baseUrl": "https://api.example.com:9443", + "cert": { + "keyStore": { + "file": "./certs/client.jks" + }, + "keyStorePassword": "client-store-pass" + } + } + } + } + }, + "version": 3 +} From 9a21f383eacd04d078b2e04cf43a73e15e8ba776 Mon Sep 17 00:00:00 2001 From: Paul Dorsch <107068277+pauld-msft@users.noreply.github.com> Date: Thu, 5 Mar 2026 18:42:16 -0500 Subject: [PATCH 2/5] Update cg manifest with additional metadata (#5438) * update with new fields * update with missing properties * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../json/component-detection-manifest.json | 374 ++++++++++++++++++ .../cgmanifest.json | 53 +++ 2 files changed, 427 insertions(+) diff --git a/src/schemas/json/component-detection-manifest.json b/src/schemas/json/component-detection-manifest.json index 993d9c276f7..638679657f2 100644 --- a/src/schemas/json/component-detection-manifest.json +++ b/src/schemas/json/component-detection-manifest.json @@ -2,6 +2,28 @@ "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/CGManifest", "definitions": { + "ActorInfo": { + "title": "ActorInfo", + "description": "Represents an actor (person, organization, or software agent). At least one of name, email, or url should be populated.", + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "email": { + "type": "string", + "format": "email" + }, + "url": { + "type": "string", + "format": "uri" + }, + "type": { + "type": "string", + "enum": ["Person", "Organization", "SoftwareAgent"] + } + } + }, "CGManifest": { "properties": { "registrations": { @@ -33,6 +55,27 @@ }, "developmentDependency": { "type": "boolean" + }, + "detectedComponentLocations": { + "description": "Additional locations impacted by this component, relative to the cgmanifest.json file or using the {SourceFileRoot} placeholder.", + "type": "array", + "items": { + "type": "string" + } + }, + "licensesConcluded": { + "description": "SPDX license expression(s) as resolved via ClearlyDefined API or curations.", + "type": "array", + "items": { + "type": "string" + } + }, + "suppliers": { + "description": "Entities that supplied/published the component.", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } } }, "required": ["component"] @@ -95,6 +138,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version"] @@ -122,6 +193,34 @@ }, "tag": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["commitHash", "repositoryUrl"] @@ -145,6 +244,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version"] @@ -182,6 +309,34 @@ "pool-URL": { "type": "string", "format": "uri" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version", "distribution", "release"] @@ -208,6 +363,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["groupId", "artifactId", "version"] @@ -231,6 +414,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version"] @@ -254,6 +465,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version"] @@ -285,6 +524,29 @@ }, "hash": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version", "downloadUrl", "hash"] @@ -308,6 +570,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version"] @@ -331,6 +621,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version"] @@ -354,6 +672,34 @@ }, "version": { "type": "string" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["name", "version"] @@ -392,6 +738,34 @@ }, "portVersion": { "type": "integer" + }, + "licenses": { + "description": "SPDX license expression(s) declared by the package author.", + "type": "array", + "items": { + "type": "string" + } + }, + "authorsInfo": { + "description": "Structured author/creator identity (SPDX 3.0.1 originatedBy).", + "type": "array", + "items": { + "$ref": "#/definitions/ActorInfo" + } + }, + "packageUrl": { + "description": "Package URL per the purl-spec.", + "type": "string" + }, + "downloadUrl": { + "description": "Direct download URL for the package binary.", + "type": "string", + "format": "uri" + }, + "sourceUrl": { + "description": "Source code repository URL.", + "type": "string", + "format": "uri" } }, "required": ["spdxId", "name"] diff --git a/src/test/component-detection-manifest/cgmanifest.json b/src/test/component-detection-manifest/cgmanifest.json index b7dcb5cd125..b6ab825fce7 100644 --- a/src/test/component-detection-manifest/cgmanifest.json +++ b/src/test/component-detection-manifest/cgmanifest.json @@ -117,6 +117,59 @@ "version": "3.10.4" } } + }, + { + "component": { + "nuget": { + "authorsInfo": [ + { "name": "Test Author", "type": "Person" }, + { + "email": "test@example.com", + "name": "Test Org", + "type": "Organization", + "url": "https://example.com" + } + ], + "downloadUrl": "https://example.com/api/v2/package/TestPackage/1.0.0", + "licenses": ["MIT"], + "name": "TestPackage", + "packageUrl": "pkg:nuget/TestPackage@1.0.0", + "sourceUrl": "https://github.com/test-org/TestPackage", + "version": "1.0.0" + }, + "type": "nuget" + }, + "dependencyRoots": [ + { + "nuget": { + "name": "TestApp", + "version": "2.0.0" + }, + "type": "nuget" + } + ], + "detectedComponentLocations": ["/src/TestApp/TestPackage.dll"], + "licensesConcluded": ["MIT"], + "suppliers": [{ "name": "Test Org", "type": "Organization" }] + }, + { + "component": { + "other": { + "downloadUrl": "https://example.com/tools/testtool-2.0.0.zip", + "hash": "abc123def456", + "name": "TestTool", + "version": "2.0.0" + }, + "type": "other" + }, + "licensesConcluded": ["Apache-2.0"], + "suppliers": [ + { + "name": "Test Person", + "type": "Person", + "url": "https://example.com/test-person" + } + ] } ], "version": 1 From db51325ab890df57aaf1f7b99f38a0fde0c1bb91 Mon Sep 17 00:00:00 2001 From: johannesoenema <12686691+johannesoenema@users.noreply.github.com> Date: Fri, 6 Mar 2026 00:42:33 +0100 Subject: [PATCH 3/5] Add distributed tracing for durable task extensions to host.json (#5439) * Add distributed tracing configuration for durable task extensions to host.json * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Johannes Oenema Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- src/schemas/json/host.json | 23 +++++++++++++++++++++++ src/test/host/host.v2.json | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/schemas/json/host.json b/src/schemas/json/host.json index 2f5ad86a544..4557786887c 100644 --- a/src/schemas/json/host.json +++ b/src/schemas/json/host.json @@ -319,6 +319,29 @@ "description": "A value indicating whether to write orchestration replay events to Application Insights.", "type": "boolean", "default": false + }, + "distributedTracingEnabled": { + "description": "Distributed tracing tracks requests and shows how different services interact with each other and correlates orchestrations, entities, and activities together.", + "type": "boolean", + "default": false + }, + "version": { + "description": "Distributed tracing version", + "oneOf": [ + { + "description": "Distributed Tracing is disabled.", + "const": "None" + }, + { + "description": "Original implementation of Distributed Tracing in Durable Functions that can be configured to use HttpCorrelationProtocol or W3CTraceContext", + "const": "V1" + }, + { + "description": "OpenTelemetry compatible version of Distributed Tracing in Durable Functions.", + "const": "V2" + } + ], + "default": "V2" } }, "additionalProperties": false diff --git a/src/test/host/host.v2.json b/src/test/host/host.v2.json index d594781b7c9..e1d4b304876 100644 --- a/src/test/host/host.v2.json +++ b/src/test/host/host.v2.json @@ -53,8 +53,10 @@ "workItemQueueVisibilityTimeout": "00:05:00" }, "tracing": { + "distributedTracingEnabled": true, "traceInputsAndOutputs": false, - "traceReplayEvents": false + "traceReplayEvents": false, + "version": "V2" }, "useAppLease": true, "useGracefulShutdown": false From 135c50e683a566f1bc032238ffb17643915b67c1 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 5 Mar 2026 15:42:56 -0800 Subject: [PATCH 4/5] Directly embed timezone enum in Dependabot schema (#5440) --- src/schemas/json/dependabot-2.0.json | 601 ++++++++++++++++++++++++++- 1 file changed, 600 insertions(+), 1 deletion(-) diff --git a/src/schemas/json/dependabot-2.0.json b/src/schemas/json/dependabot-2.0.json index cc949fa1682..796ba60a955 100644 --- a/src/schemas/json/dependabot-2.0.json +++ b/src/schemas/json/dependabot-2.0.json @@ -4,7 +4,606 @@ "additionalProperties": false, "definitions": { "timezone": { - "$ref": "https://json.schemastore.org/base.json#/definitions/timezone" + "type": "string", + "enum": [ + "Africa/Abidjan", + "Africa/Accra", + "Africa/Addis_Ababa", + "Africa/Algiers", + "Africa/Asmara", + "Africa/Asmera", + "Africa/Bamako", + "Africa/Bangui", + "Africa/Banjul", + "Africa/Bissau", + "Africa/Blantyre", + "Africa/Brazzaville", + "Africa/Bujumbura", + "Africa/Cairo", + "Africa/Casablanca", + "Africa/Ceuta", + "Africa/Conakry", + "Africa/Dakar", + "Africa/Dar_es_Salaam", + "Africa/Djibouti", + "Africa/Douala", + "Africa/El_Aaiun", + "Africa/Freetown", + "Africa/Gaborone", + "Africa/Harare", + "Africa/Johannesburg", + "Africa/Juba", + "Africa/Kampala", + "Africa/Khartoum", + "Africa/Kigali", + "Africa/Kinshasa", + "Africa/Lagos", + "Africa/Libreville", + "Africa/Lome", + "Africa/Luanda", + "Africa/Lubumbashi", + "Africa/Lusaka", + "Africa/Malabo", + "Africa/Maputo", + "Africa/Maseru", + "Africa/Mbabane", + "Africa/Mogadishu", + "Africa/Monrovia", + "Africa/Nairobi", + "Africa/Ndjamena", + "Africa/Niamey", + "Africa/Nouakchott", + "Africa/Ouagadougou", + "Africa/Porto-Novo", + "Africa/Sao_Tome", + "Africa/Timbuktu", + "Africa/Tripoli", + "Africa/Tunis", + "Africa/Windhoek", + "America/Adak", + "America/Anchorage", + "America/Anguilla", + "America/Antigua", + "America/Araguaina", + "America/Argentina/Buenos_Aires", + "America/Argentina/Catamarca", + "America/Argentina/ComodRivadavia", + "America/Argentina/Cordoba", + "America/Argentina/Jujuy", + "America/Argentina/La_Rioja", + "America/Argentina/Mendoza", + "America/Argentina/Rio_Gallegos", + "America/Argentina/Salta", + "America/Argentina/San_Juan", + "America/Argentina/San_Luis", + "America/Argentina/Tucuman", + "America/Argentina/Ushuaia", + "America/Aruba", + "America/Asuncion", + "America/Atikokan", + "America/Atka", + "America/Bahia", + "America/Bahia_Banderas", + "America/Barbados", + "America/Belem", + "America/Belize", + "America/Blanc-Sablon", + "America/Boa_Vista", + "America/Bogota", + "America/Boise", + "America/Buenos_Aires", + "America/Cambridge_Bay", + "America/Campo_Grande", + "America/Cancun", + "America/Caracas", + "America/Catamarca", + "America/Cayenne", + "America/Cayman", + "America/Chicago", + "America/Chihuahua", + "America/Ciudad_Juarez", + "America/Coral_Harbour", + "America/Cordoba", + "America/Costa_Rica", + "America/Coyhaique", + "America/Creston", + "America/Cuiaba", + "America/Curacao", + "America/Danmarkshavn", + "America/Dawson", + "America/Dawson_Creek", + "America/Denver", + "America/Detroit", + "America/Dominica", + "America/Edmonton", + "America/Eirunepe", + "America/El_Salvador", + "America/Ensenada", + "America/Fort_Nelson", + "America/Fort_Wayne", + "America/Fortaleza", + "America/Glace_Bay", + "America/Godthab", + "America/Goose_Bay", + "America/Grand_Turk", + "America/Grenada", + "America/Guadeloupe", + "America/Guatemala", + "America/Guayaquil", + "America/Guyana", + "America/Halifax", + "America/Havana", + "America/Hermosillo", + "America/Indiana/Indianapolis", + "America/Indiana/Knox", + "America/Indiana/Marengo", + "America/Indiana/Petersburg", + "America/Indiana/Tell_City", + "America/Indiana/Vevay", + "America/Indiana/Vincennes", + "America/Indiana/Winamac", + "America/Indianapolis", + "America/Inuvik", + "America/Iqaluit", + "America/Jamaica", + "America/Jujuy", + "America/Juneau", + "America/Kentucky/Louisville", + "America/Kentucky/Monticello", + "America/Knox_IN", + "America/Kralendijk", + "America/La_Paz", + "America/Lima", + "America/Los_Angeles", + "America/Louisville", + "America/Lower_Princes", + "America/Maceio", + "America/Managua", + "America/Manaus", + "America/Marigot", + "America/Martinique", + "America/Matamoros", + "America/Mazatlan", + "America/Mendoza", + "America/Menominee", + "America/Merida", + "America/Metlakatla", + "America/Mexico_City", + "America/Miquelon", + "America/Moncton", + "America/Monterrey", + "America/Montevideo", + "America/Montreal", + "America/Montserrat", + "America/Nassau", + "America/New_York", + "America/Nipigon", + "America/Nome", + "America/Noronha", + "America/North_Dakota/Beulah", + "America/North_Dakota/Center", + "America/North_Dakota/New_Salem", + "America/Nuuk", + "America/Ojinaga", + "America/Panama", + "America/Pangnirtung", + "America/Paramaribo", + "America/Phoenix", + "America/Port-au-Prince", + "America/Port_of_Spain", + "America/Porto_Acre", + "America/Porto_Velho", + "America/Puerto_Rico", + "America/Punta_Arenas", + "America/Rainy_River", + "America/Rankin_Inlet", + "America/Recife", + "America/Regina", + "America/Resolute", + "America/Rio_Branco", + "America/Rosario", + "America/Santa_Isabel", + "America/Santarem", + "America/Santiago", + "America/Santo_Domingo", + "America/Sao_Paulo", + "America/Scoresbysund", + "America/Shiprock", + "America/Sitka", + "America/St_Barthelemy", + "America/St_Johns", + "America/St_Kitts", + "America/St_Lucia", + "America/St_Thomas", + "America/St_Vincent", + "America/Swift_Current", + "America/Tegucigalpa", + "America/Thule", + "America/Thunder_Bay", + "America/Tijuana", + "America/Toronto", + "America/Tortola", + "America/Vancouver", + "America/Virgin", + "America/Whitehorse", + "America/Winnipeg", + "America/Yakutat", + "America/Yellowknife", + "Antarctica/Casey", + "Antarctica/Davis", + "Antarctica/DumontDUrville", + "Antarctica/Macquarie", + "Antarctica/Mawson", + "Antarctica/McMurdo", + "Antarctica/Palmer", + "Antarctica/Rothera", + "Antarctica/South_Pole", + "Antarctica/Syowa", + "Antarctica/Troll", + "Antarctica/Vostok", + "Arctic/Longyearbyen", + "Asia/Aden", + "Asia/Almaty", + "Asia/Amman", + "Asia/Anadyr", + "Asia/Aqtau", + "Asia/Aqtobe", + "Asia/Ashgabat", + "Asia/Ashkhabad", + "Asia/Atyrau", + "Asia/Baghdad", + "Asia/Bahrain", + "Asia/Baku", + "Asia/Bangkok", + "Asia/Barnaul", + "Asia/Beirut", + "Asia/Bishkek", + "Asia/Brunei", + "Asia/Calcutta", + "Asia/Chita", + "Asia/Choibalsan", + "Asia/Chongqing", + "Asia/Chungking", + "Asia/Colombo", + "Asia/Dacca", + "Asia/Damascus", + "Asia/Dhaka", + "Asia/Dili", + "Asia/Dubai", + "Asia/Dushanbe", + "Asia/Famagusta", + "Asia/Gaza", + "Asia/Harbin", + "Asia/Hebron", + "Asia/Ho_Chi_Minh", + "Asia/Hong_Kong", + "Asia/Hovd", + "Asia/Irkutsk", + "Asia/Istanbul", + "Asia/Jakarta", + "Asia/Jayapura", + "Asia/Jerusalem", + "Asia/Kabul", + "Asia/Kamchatka", + "Asia/Karachi", + "Asia/Kashgar", + "Asia/Kathmandu", + "Asia/Katmandu", + "Asia/Khandyga", + "Asia/Kolkata", + "Asia/Krasnoyarsk", + "Asia/Kuala_Lumpur", + "Asia/Kuching", + "Asia/Kuwait", + "Asia/Macao", + "Asia/Macau", + "Asia/Magadan", + "Asia/Makassar", + "Asia/Manila", + "Asia/Muscat", + "Asia/Nicosia", + "Asia/Novokuznetsk", + "Asia/Novosibirsk", + "Asia/Omsk", + "Asia/Oral", + "Asia/Phnom_Penh", + "Asia/Pontianak", + "Asia/Pyongyang", + "Asia/Qatar", + "Asia/Qostanay", + "Asia/Qyzylorda", + "Asia/Rangoon", + "Asia/Riyadh", + "Asia/Saigon", + "Asia/Sakhalin", + "Asia/Samarkand", + "Asia/Seoul", + "Asia/Shanghai", + "Asia/Singapore", + "Asia/Srednekolymsk", + "Asia/Taipei", + "Asia/Tashkent", + "Asia/Tbilisi", + "Asia/Tehran", + "Asia/Tel_Aviv", + "Asia/Thimbu", + "Asia/Thimphu", + "Asia/Tokyo", + "Asia/Tomsk", + "Asia/Ujung_Pandang", + "Asia/Ulaanbaatar", + "Asia/Ulan_Bator", + "Asia/Urumqi", + "Asia/Ust-Nera", + "Asia/Vientiane", + "Asia/Vladivostok", + "Asia/Yakutsk", + "Asia/Yangon", + "Asia/Yekaterinburg", + "Asia/Yerevan", + "Atlantic/Azores", + "Atlantic/Bermuda", + "Atlantic/Canary", + "Atlantic/Cape_Verde", + "Atlantic/Faeroe", + "Atlantic/Faroe", + "Atlantic/Jan_Mayen", + "Atlantic/Madeira", + "Atlantic/Reykjavik", + "Atlantic/South_Georgia", + "Atlantic/St_Helena", + "Atlantic/Stanley", + "Australia/ACT", + "Australia/Adelaide", + "Australia/Brisbane", + "Australia/Broken_Hill", + "Australia/Canberra", + "Australia/Currie", + "Australia/Darwin", + "Australia/Eucla", + "Australia/Hobart", + "Australia/LHI", + "Australia/Lindeman", + "Australia/Lord_Howe", + "Australia/Melbourne", + "Australia/NSW", + "Australia/North", + "Australia/Perth", + "Australia/Queensland", + "Australia/South", + "Australia/Sydney", + "Australia/Tasmania", + "Australia/Victoria", + "Australia/West", + "Australia/Yancowinna", + "Brazil/Acre", + "Brazil/DeNoronha", + "Brazil/East", + "Brazil/West", + "CET", + "CST6CDT", + "Canada/Atlantic", + "Canada/Central", + "Canada/Eastern", + "Canada/Mountain", + "Canada/Newfoundland", + "Canada/Pacific", + "Canada/Saskatchewan", + "Canada/Yukon", + "Chile/Continental", + "Chile/EasterIsland", + "Cuba", + "EET", + "EST", + "EST5EDT", + "Egypt", + "Eire", + "Etc/GMT", + "Etc/GMT+0", + "Etc/GMT+1", + "Etc/GMT+10", + "Etc/GMT+11", + "Etc/GMT+12", + "Etc/GMT+2", + "Etc/GMT+3", + "Etc/GMT+4", + "Etc/GMT+5", + "Etc/GMT+6", + "Etc/GMT+7", + "Etc/GMT+8", + "Etc/GMT+9", + "Etc/GMT-0", + "Etc/GMT-1", + "Etc/GMT-10", + "Etc/GMT-11", + "Etc/GMT-12", + "Etc/GMT-13", + "Etc/GMT-14", + "Etc/GMT-2", + "Etc/GMT-3", + "Etc/GMT-4", + "Etc/GMT-5", + "Etc/GMT-6", + "Etc/GMT-7", + "Etc/GMT-8", + "Etc/GMT-9", + "Etc/GMT0", + "Etc/Greenwich", + "Etc/UCT", + "Etc/UTC", + "Etc/Universal", + "Etc/Zulu", + "Europe/Amsterdam", + "Europe/Andorra", + "Europe/Astrakhan", + "Europe/Athens", + "Europe/Belfast", + "Europe/Belgrade", + "Europe/Berlin", + "Europe/Bratislava", + "Europe/Brussels", + "Europe/Bucharest", + "Europe/Budapest", + "Europe/Busingen", + "Europe/Chisinau", + "Europe/Copenhagen", + "Europe/Dublin", + "Europe/Gibraltar", + "Europe/Guernsey", + "Europe/Helsinki", + "Europe/Isle_of_Man", + "Europe/Istanbul", + "Europe/Jersey", + "Europe/Kaliningrad", + "Europe/Kiev", + "Europe/Kirov", + "Europe/Kyiv", + "Europe/Lisbon", + "Europe/Ljubljana", + "Europe/London", + "Europe/Luxembourg", + "Europe/Madrid", + "Europe/Malta", + "Europe/Mariehamn", + "Europe/Minsk", + "Europe/Monaco", + "Europe/Moscow", + "Europe/Nicosia", + "Europe/Oslo", + "Europe/Paris", + "Europe/Podgorica", + "Europe/Prague", + "Europe/Riga", + "Europe/Rome", + "Europe/Samara", + "Europe/San_Marino", + "Europe/Sarajevo", + "Europe/Saratov", + "Europe/Simferopol", + "Europe/Skopje", + "Europe/Sofia", + "Europe/Stockholm", + "Europe/Tallinn", + "Europe/Tirane", + "Europe/Tiraspol", + "Europe/Ulyanovsk", + "Europe/Uzhgorod", + "Europe/Vaduz", + "Europe/Vatican", + "Europe/Vienna", + "Europe/Vilnius", + "Europe/Volgograd", + "Europe/Warsaw", + "Europe/Zagreb", + "Europe/Zaporozhye", + "Europe/Zurich", + "GB", + "GB-Eire", + "GMT", + "GMT+0", + "GMT-0", + "GMT0", + "Greenwich", + "HST", + "Hongkong", + "Iceland", + "Indian/Antananarivo", + "Indian/Chagos", + "Indian/Christmas", + "Indian/Cocos", + "Indian/Comoro", + "Indian/Kerguelen", + "Indian/Mahe", + "Indian/Maldives", + "Indian/Mauritius", + "Indian/Mayotte", + "Indian/Reunion", + "Iran", + "Israel", + "Jamaica", + "Japan", + "Kwajalein", + "Libya", + "MET", + "MST", + "MST7MDT", + "Mexico/BajaNorte", + "Mexico/BajaSur", + "Mexico/General", + "NZ", + "NZ-CHAT", + "Navajo", + "PRC", + "PST8PDT", + "Pacific/Apia", + "Pacific/Auckland", + "Pacific/Bougainville", + "Pacific/Chatham", + "Pacific/Chuuk", + "Pacific/Easter", + "Pacific/Efate", + "Pacific/Enderbury", + "Pacific/Fakaofo", + "Pacific/Fiji", + "Pacific/Funafuti", + "Pacific/Galapagos", + "Pacific/Gambier", + "Pacific/Guadalcanal", + "Pacific/Guam", + "Pacific/Honolulu", + "Pacific/Johnston", + "Pacific/Kanton", + "Pacific/Kiritimati", + "Pacific/Kosrae", + "Pacific/Kwajalein", + "Pacific/Majuro", + "Pacific/Marquesas", + "Pacific/Midway", + "Pacific/Nauru", + "Pacific/Niue", + "Pacific/Norfolk", + "Pacific/Noumea", + "Pacific/Pago_Pago", + "Pacific/Palau", + "Pacific/Pitcairn", + "Pacific/Pohnpei", + "Pacific/Ponape", + "Pacific/Port_Moresby", + "Pacific/Rarotonga", + "Pacific/Saipan", + "Pacific/Samoa", + "Pacific/Tahiti", + "Pacific/Tarawa", + "Pacific/Tongatapu", + "Pacific/Truk", + "Pacific/Wake", + "Pacific/Wallis", + "Pacific/Yap", + "Poland", + "Portugal", + "ROC", + "ROK", + "Singapore", + "Turkey", + "UCT", + "US/Alaska", + "US/Aleutian", + "US/Arizona", + "US/Central", + "US/East-Indiana", + "US/Eastern", + "US/Hawaii", + "US/Indiana-Starke", + "US/Michigan", + "US/Mountain", + "US/Pacific", + "US/Samoa", + "UTC", + "Universal", + "W-SU", + "WET", + "Zulu" + ] }, "dependency-type": { "type": "string", From 86166b9f2ddaf26ce4a1a6839f22814a1bc96b91 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 5 Mar 2026 18:43:16 -0500 Subject: [PATCH 5/5] chore: cibuildwheel 3.4 (#5443) Signed-off-by: Henry Schreiner --- src/schemas/json/partial-cibuildwheel.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/schemas/json/partial-cibuildwheel.json b/src/schemas/json/partial-cibuildwheel.json index 06c0078228b..cb8940022f5 100644 --- a/src/schemas/json/partial-cibuildwheel.json +++ b/src/schemas/json/partial-cibuildwheel.json @@ -9,7 +9,6 @@ }, "enable": { "enum": [ - "cpython-experimental-riscv64", "cpython-freethreading", "cpython-prerelease", "graalpy", @@ -102,10 +101,10 @@ }, "build-frontend": { "default": "default", - "description": "Set the tool to use to build, either \"build\" (default), \"build[uv]\", or \"pip\"", + "description": "Set the tool to use to build, either \"build\" (default), \"build[uv]\", \"uv\", or \"pip\"", "oneOf": [ { - "enum": ["pip", "build", "build[uv]", "default"] + "enum": ["pip", "build", "build[uv]", "uv", "default"] }, { "type": "string", @@ -119,13 +118,17 @@ "type": "string", "pattern": "^build\\[uv\\]; ?args:" }, + { + "type": "string", + "pattern": "^uv; ?args:" + }, { "type": "object", "additionalProperties": false, "required": ["name"], "properties": { "name": { - "enum": ["pip", "build", "build[uv]"] + "enum": ["pip", "build", "build[uv]", "uv"] }, "args": { "type": "array",