From e773e5c8121a2e5a0d4e272195fd259028365126 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 00:37:12 -0600 Subject: [PATCH 1/7] Bump click-type-test from 1.0.0 to 1.1.0 (#522) Bumps [click-type-test](https://github.com/sirosen/click-type-test) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/sirosen/click-type-test/releases) - [Changelog](https://github.com/sirosen/click-type-test/blob/main/CHANGELOG.md) - [Commits](https://github.com/sirosen/click-type-test/compare/1.0.0...1.1.0) --- updated-dependencies: - dependency-name: click-type-test dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2a56a7c8c..133114e49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ Homepage = "https://github.com/python-jsonschema/check-jsonschema" [project.optional-dependencies] dev = [ "pytest<9", - 'click-type-test==1.0.0;python_version>="3.10"', + 'click-type-test==1.1.0;python_version>="3.10"', "coverage<8", "pytest-xdist<4", "responses==0.25.3", From e6f3ca4068912cf89b3ea50be8c5e6fcf63f4b95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 01:13:45 -0600 Subject: [PATCH 2/7] Bump responses from 0.25.3 to 0.25.6 (#523) Bumps [responses](https://github.com/getsentry/responses) from 0.25.3 to 0.25.6. - [Release notes](https://github.com/getsentry/responses/releases) - [Changelog](https://github.com/getsentry/responses/blob/master/CHANGES) - [Commits](https://github.com/getsentry/responses/compare/0.25.3...0.25.6) --- updated-dependencies: - dependency-name: responses dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 133114e49..f875615c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ dev = [ 'click-type-test==1.1.0;python_version>="3.10"', "coverage<8", "pytest-xdist<4", - "responses==0.25.3", + "responses==0.25.6", ] docs = [ "sphinx<9", From 14150ec8dbd6ead741cd441cb5616288211b8aa6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 15:34:11 -0600 Subject: [PATCH 3/7] [pre-commit.ci] pre-commit autoupdate (#525) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/python-jsonschema/check-jsonschema: 0.31.0 → 0.31.1](https://github.com/python-jsonschema/check-jsonschema/compare/0.31.0...0.31.1) - [github.com/psf/black-pre-commit-mirror: 24.10.0 → 25.1.0](https://github.com/psf/black-pre-commit-mirror/compare/24.10.0...25.1.0) - [github.com/PyCQA/isort: 5.13.2 → 6.0.0](https://github.com/PyCQA/isort/compare/5.13.2...6.0.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4eede38f1..bb7843cc2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: # dogfood - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.0 + rev: 0.31.1 hooks: - id: check-dependabot - id: check-github-workflows @@ -24,7 +24,7 @@ repos: - id: check-merge-conflict - id: trailing-whitespace - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.10.0 + rev: 25.1.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 @@ -40,7 +40,7 @@ repos: hooks: - id: slyp - repo: https://github.com/PyCQA/isort - rev: 5.13.2 + rev: 6.0.0 hooks: - id: isort - repo: https://github.com/asottile/pyupgrade From f41a2c6811052292da0ce202897339d66cefbe90 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 17 Feb 2025 14:26:58 -0600 Subject: [PATCH 4/7] [pre-commit.ci] pre-commit autoupdate (#527) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/PyCQA/flake8: 7.1.1 → 7.1.2](https://github.com/PyCQA/flake8/compare/7.1.1...7.1.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bb7843cc2..2cb7de293 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 7.1.1 + rev: 7.1.2 hooks: - id: flake8 additional_dependencies: From 534c90d6b2d2fd7d99cd6fc34688cf3e05ac2cff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2025 19:57:11 -0600 Subject: [PATCH 5/7] [vendor-schemas] automated update (#524) Co-authored-by: sirosen <1300022+sirosen@users.noreply.github.com> --- CHANGELOG.rst | 2 + .../builtin_schemas/vendor/gitlab-ci.json | 28 ++++++----- .../builtin_schemas/vendor/renovate.json | 49 ++++++++++++++++--- .../vendor/sha256/gitlab-ci.sha256 | 2 +- .../vendor/sha256/renovate.sha256 | 2 +- .../vendor/sha256/woodpecker-ci.sha256 | 2 +- .../builtin_schemas/vendor/woodpecker-ci.json | 20 +++++--- 7 files changed, 78 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 484aa5f9b..50c3bd9ac 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,8 @@ Unreleased .. vendor-insert-here +- Update vendored schemas (2025-02-16) + 0.31.1 ------ diff --git a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json index 15b27b319..4d7dc7f26 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://gitlab.com/.gitlab-ci.yml", - "markdownDescription": "Gitlab has a built-in solution for doing CI called Gitlab CI. It is configured by supplying a file called `.gitlab-ci.yml`, which will list all the jobs that are going to run for the project. A full list of all options can be found [here](https://docs.gitlab.com/ee/ci/yaml). [Learn More](https://docs.gitlab.com/ee/ci/index.html).", + "markdownDescription": "Gitlab has a built-in solution for doing CI called Gitlab CI. It is configured by supplying a file called `.gitlab-ci.yml`, which will list all the jobs that are going to run for the project. A full list of all options can be found [here](https://docs.gitlab.com/ee/ci/yaml/). [Learn More](https://docs.gitlab.com/ee/ci/).", "type": "object", "properties": { "$schema": { @@ -433,7 +433,7 @@ "additionalProperties": false, "properties": { "project": { - "description": "Path to the project, e.g. `group/project`, or `group/sub-group/project` [Learn more](https://docs.gitlab.com/ee/ci/yaml/index.html#includefile).", + "description": "Path to the project, e.g. `group/project`, or `group/sub-group/project` [Learn more](https://docs.gitlab.com/ee/ci/yaml/#includefile).", "type": "string", "pattern": "(?:\\S/\\S|\\$\\S+)" }, @@ -638,7 +638,7 @@ }, "entrypoint": { "type": "array", - "markdownDescription": "Command or script that should be executed as the container's entrypoint. It will be translated to Docker's --entrypoint option while creating the container. The syntax is similar to Dockerfile's ENTRYPOINT directive, where each shell token is a separate string in the array. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)", + "markdownDescription": "Command or script that should be executed as the container's entrypoint. It will be translated to Docker's --entrypoint option while creating the container. The syntax is similar to Dockerfile's ENTRYPOINT directive, where each shell token is a separate string in the array. [Learn More](https://docs.gitlab.com/ee/ci/services/#available-settings-for-services)", "minItems": 1, "items": { "type": "string" @@ -691,7 +691,7 @@ }, "command": { "type": "array", - "markdownDescription": "Command or script that should be used as the container's command. It will be translated to arguments passed to Docker after the image's name. The syntax is similar to Dockerfile's CMD directive, where each shell token is a separate string in the array. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)", + "markdownDescription": "Command or script that should be used as the container's command. It will be translated to arguments passed to Docker after the image's name. The syntax is similar to Dockerfile's CMD directive, where each shell token is a separate string in the array. [Learn More](https://docs.gitlab.com/ee/ci/services/#available-settings-for-services)", "minItems": 1, "items": { "type": "string" @@ -699,12 +699,12 @@ }, "alias": { "type": "string", - "markdownDescription": "Additional alias that can be used to access the service from the job's container. Read Accessing the services for more information. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)", + "markdownDescription": "Additional alias that can be used to access the service from the job's container. Read Accessing the services for more information. [Learn More](https://docs.gitlab.com/ee/ci/services/#available-settings-for-services)", "minLength": 1 }, "variables": { "$ref": "#/definitions/jobVariables", - "markdownDescription": "Additional environment variables that are passed exclusively to the service. Service variables cannot reference themselves. [Learn More](https://docs.gitlab.com/ee/ci/services/index.html#available-settings-for-services)" + "markdownDescription": "Additional environment variables that are passed exclusively to the service. Service variables cannot reference themselves. [Learn More](https://docs.gitlab.com/ee/ci/services/#available-settings-for-services)" } }, "required": [ @@ -1174,7 +1174,7 @@ } }, "rulesVariables": { - "markdownDescription": "Defines variables for a rule result. [Learn More](https://docs.gitlab.com/ee/ci/yaml/index.html#rulesvariables).", + "markdownDescription": "Defines variables for a rule result. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#rulesvariables).", "type": "object", "patternProperties": { ".*": { @@ -1279,7 +1279,7 @@ }, "timeout": { "type": "string", - "markdownDescription": "Allows you to configure a timeout for a specific job (e.g. `1 minute`, `1h 30m 12s`). [Learn More](https://docs.gitlab.com/ee/ci/yaml/index.html#timeout).", + "markdownDescription": "Allows you to configure a timeout for a specific job (e.g. `1 minute`, `1h 30m 12s`). [Learn More](https://docs.gitlab.com/ee/ci/yaml/#timeout).", "minLength": 1 }, "start_in": { @@ -1288,7 +1288,7 @@ "minLength": 1 }, "rulesNeeds": { - "markdownDescription": "Use needs in rules to update job needs for specific conditions. When a condition matches a rule, the job's needs configuration is completely replaced with the needs in the rule. [Learn More](https://docs.gitlab.com/ee/ci/yaml/index.html#rulesneeds).", + "markdownDescription": "Use needs in rules to update job needs for specific conditions. When a condition matches a rule, the job's needs configuration is completely replaced with the needs in the rule. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#rulesneeds).", "type": "array", "items": { "oneOf": [ @@ -2152,7 +2152,7 @@ "description": "Limit job concurrency. Can be used to ensure that the Runner will not run certain jobs simultaneously." }, "trigger": { - "markdownDescription": "Trigger allows you to define downstream pipeline trigger. When a job created from trigger definition is started by GitLab, a downstream pipeline gets created. [Learn More](https://docs.gitlab.com/ee/ci/yaml/index.html#trigger).", + "markdownDescription": "Trigger allows you to define downstream pipeline trigger. When a job created from trigger definition is started by GitLab, a downstream pipeline gets created. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#trigger).", "oneOf": [ { "type": "object", @@ -2376,7 +2376,7 @@ } }, { - "markdownDescription": "Path to the project, e.g. `group/project`, or `group/sub-group/project`. [Learn More](https://docs.gitlab.com/ee/ci/yaml/index.html#trigger).", + "markdownDescription": "Path to the project, e.g. `group/project`, or `group/sub-group/project`. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#trigger).", "type": "string", "pattern": "(?:\\S/\\S|\\$\\S+)" } @@ -2430,7 +2430,7 @@ "additionalProperties": false }, "publish": { - "description": "A path to a directory that contains the files to be published with Pages", + "description": "Deprecated. Use `pages.publish` instead. A path to a directory that contains the files to be published with Pages.", "type": "string" }, "pages": { @@ -2446,6 +2446,10 @@ "expire_in": { "type": "string", "markdownDescription": "How long the deployment should be active. Deployments that have expired are no longer available on the web. Supports a wide variety of formats, e.g. '1 week', '3 mins 4 sec', '2 hrs 20 min', '2h20min', '6 mos 1 day', '47 yrs 6 mos and 4d', '3 weeks and 2 days'. Set to 'never' to prevent extra deployments from expiring. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#pagesexpire_in)." + }, + "publish": { + "type": "string", + "markdownDescription": "A path to a directory that contains the files to be published with Pages." } } }, diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index a9f02f44c..02a250639 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -860,6 +860,7 @@ "description": "Custom manager to use. Valid only within a `customManagers` object.", "type": "string", "enum": [ + "jsonata", "regex" ] }, @@ -879,12 +880,19 @@ "description": "Optional `extractVersion` for extracted dependencies. Valid only within a `customManagers` object.", "type": "string" }, + "fileFormat": { + "description": "It specifies the syntax of the package file being managed by the custom JSONata manager.", + "type": "string", + "enum": [ + "json", + "yaml" + ] + }, "matchStrings": { - "description": "Regex capture rule to use. Valid only within a `customManagers` object.", + "description": "Queries to use. Valid only within a `customManagers` object.", "type": "array", "items": { - "type": "string", - "format": "regex" + "type": "string" } }, "matchStringsStrategy": { @@ -1024,6 +1032,16 @@ "type": "boolean", "default": false }, + "devbox": { + "description": "Configuration object for the devbox manager", + "type": "object", + "default": { + "fileMatch": [ + "(^|/)devbox\\.json$" + ] + }, + "$ref": "#" + }, "devcontainer": { "description": "Configuration object for the devcontainer manager", "type": "object", @@ -1072,7 +1090,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:13.7.1" + "default": "ghcr.io/containerbase/sidecar:13.7.2" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", @@ -1908,6 +1926,14 @@ }, "$ref": "#" }, + "jsonata": { + "description": "Configuration object for the jsonata manager", + "type": "object", + "default": { + "pinDigests": false + }, + "$ref": "#" + }, "jsonnet-bundler": { "description": "Configuration object for the jsonnet-bundler manager", "type": "object", @@ -2191,7 +2217,7 @@ "fileMatch": [ "(^|/)flake\\.nix$" ], - "commitMessageTopic": "nixpkgs", + "commitMessageTopic": "nix", "commitMessageExtra": "to {{newValue}}", "enabled": false }, @@ -2213,7 +2239,8 @@ "type": "object", "default": { "fileMatch": [ - "(^|/)package\\.json$" + "(^|/)package\\.json$", + "(^|/)pnpm-workspace\\.yaml$" ], "digest": { "prBodyDefinitions": { @@ -3165,6 +3192,15 @@ }, "$ref": "#" }, + "replacementApproach": { + "description": "Select whether to perform a direct replacement or alias replacement.", + "type": "string", + "enum": [ + "replace", + "alias" + ], + "default": "replace" + }, "reportPath": { "description": "Path to where the file should be written. In case of `s3` this has to be a full S3 URI.", "type": [ @@ -3635,6 +3671,7 @@ "oneOf": [ { "enum": [ + "aws-eks-addon", "aws-machine-image", "azure-rest-api", "bazel-module", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 index b226c3b98..0697b7616 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 @@ -1 +1 @@ -da5b6762e83b0d89dd145d0f9b8a25ef068b790577304df65d2d2bd5a4e0b21f \ No newline at end of file +f48b339b4ea94722060efb40d884ce2089a48b6732ef666538958d08102f45a2 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 index 276cb6555..ea770b404 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 @@ -1 +1 @@ -86655aecc05722842a57425aee1c82c6cfb120fe919940298355e72163c76e8e \ No newline at end of file +b927d2478e21f6bc423771ad88943933c9b6af2421dc29de4b247c93f0ec9555 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 index 887419bad..236d69bfa 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 @@ -1 +1 @@ -07850196eb7ee8c4f01f328d1a4345d2a4981b0086b33d1fd014dfeb3cc4316e \ No newline at end of file +cbdc42a5f4ff756568f95391688075622327e790cdcb669719cec3e192923878 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json b/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json index 6fcb37630..8cde9d42c 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json @@ -762,15 +762,23 @@ "description": "A target which a native Kubernetes secret maps to.", "oneOf": [ { - "env": { - "description": "The name of the environment variable which secret maps to.", - "type": "string" + "type": "object", + "additionalProperties": false, + "properties": { + "env": { + "description": "The name of the environment variable which secret maps to.", + "type": "string" + } } }, { - "file": { - "description": "The filename (path) which secret maps to.", - "type": "string" + "type": "object", + "additionalProperties": false, + "properties": { + "file": { + "description": "The filename (path) which secret maps to.", + "type": "string" + } } } ] From 9decd7fb9769c309c171203db2fc69acfa103878 Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Wed, 19 Feb 2025 21:21:42 -0600 Subject: [PATCH 6/7] Update the vendor-schemas script to list names The changelog modification step now - pulls the names of updated schemas from the changelog - adds any new updated schemas - sorts - textwraps - replaces any existing changelog item for schema updates And run the script, getting the latest updates and updating wtih schema names since the last release. --- CHANGELOG.rst | 3 +- RELEASING.md | 2 - scripts/vendor-schemas.py | 32 +++++-- .../builtin_schemas/vendor/dependabot.json | 1 + .../vendor/github-workflows.json | 1 + .../builtin_schemas/vendor/gitlab-ci.json | 5 ++ .../builtin_schemas/vendor/mergify.json | 85 ------------------- .../vendor/sha256/dependabot.sha256 | 2 +- .../vendor/sha256/github-workflows.sha256 | 2 +- .../vendor/sha256/gitlab-ci.sha256 | 2 +- .../vendor/sha256/mergify.sha256 | 2 +- 11 files changed, 39 insertions(+), 98 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 50c3bd9ac..4c1df3cc3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,8 @@ Unreleased .. vendor-insert-here -- Update vendored schemas (2025-02-16) +- Update vendored schemas: dependabot, github-workflows, gitlab-ci, mergify, renovate, + woodpecker-ci (2025-02-19) 0.31.1 ------ diff --git a/RELEASING.md b/RELEASING.md index c473f645b..e03c89fab 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,8 +1,6 @@ # Releasing - Bump the version with `./scripts/bump-version.py NEW_VERSION` -- In the changelog, if there were vendored schema updates, note their - names (see past changelog entries for examples) - Add, commit with `git commit -m 'Bump version for release'`, and push - Create a release tag, which will auto-publish to testpypi (`make release`) - Create a GitHub release, which will auto-publish to pypi (web UI) diff --git a/scripts/vendor-schemas.py b/scripts/vendor-schemas.py index e7948be43..4d81ddd37 100644 --- a/scripts/vendor-schemas.py +++ b/scripts/vendor-schemas.py @@ -6,6 +6,7 @@ import os import re import subprocess +import textwrap import requests @@ -17,8 +18,9 @@ EXISTING_CHANGELINE_PATTERN = re.compile( re.escape(VENDOR_SLUG) - + "\n?- Update vendored schemas" - + r" \(\d{4}-\d{2}-\d{2}\)" + + "\n?- Update vendored schemas: " + + r"([\w-]+(,\s+[\w-]+)*) " + + r"\(\d{4}-\d{2}-\d{2}\)" + "\n", flags=re.MULTILINE, ) @@ -121,12 +123,30 @@ def update_changelog() -> None: print("changes were made, updating changelog") with open("CHANGELOG.rst", encoding="utf-8") as fp: content = fp.read() - new_slug = VENDOR_SLUG + f"\n- Update vendored schemas ({TODAY})\n" - if EXISTING_CHANGELINE_PATTERN.search(content): - content = EXISTING_CHANGELINE_PATTERN.sub(new_slug, content) + new_item_prefix = "- Update vendored schemas:" + + if match := EXISTING_CHANGELINE_PATTERN.search(content): + updated_schemas = {s.rstrip(",") for s in match.group(1).split()} + updated_schemas.update(SCHEMAS_WITH_NEW_HASHES) + else: + updated_schemas = SCHEMAS_WITH_NEW_HASHES + + schema_list = sorted(updated_schemas) + new_item = new_item_prefix + f" {', '.join(schema_list)} ({TODAY})\n" + + new_item = "\n".join( + textwrap.wrap( + new_item, break_on_hyphens=False, subsequent_indent=" ", width=88 + ) + ) + new_item = f"{VENDOR_SLUG}\n{new_item}\n" + + if match: + content = EXISTING_CHANGELINE_PATTERN.sub(new_item, content) else: - content = content.replace(VENDOR_SLUG, new_slug) + content = content.replace(VENDOR_SLUG, new_item) + with open("CHANGELOG.rst", "w", encoding="utf-8") as fp: fp.write(content) diff --git a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json index c860ceac1..8a108d0e3 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json +++ b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json @@ -647,6 +647,7 @@ }, "package-ecosystem-values": { "enum": [ + "bun", "bundler", "cargo", "composer", diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json index 842f5d493..de4dcd891 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json +++ b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json @@ -1640,6 +1640,7 @@ "description": "You can schedule a workflow to run at specific UTC times using POSIX cron syntax (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07). Scheduled workflows run on the latest commit on the default or base branch. The shortest interval you can run scheduled workflows is once every 5 minutes.\nNote: GitHub Actions does not support the non-standard syntax @yearly, @monthly, @weekly, @daily, @hourly, and @reboot.\nYou can use crontab guru (https://crontab.guru/). to help generate your cron syntax and confirm what time it will run. To help you get started, there is also a list of crontab guru examples (https://crontab.guru/examples.html).", "type": "array", "items": { + "type": "object", "properties": { "cron": { "type": "string" diff --git a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json index 4d7dc7f26..481f52212 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json @@ -521,6 +521,11 @@ "format": "uri-reference", "pattern": "^https?://.+\\.ya?ml$" }, + "integrity": { + "description": "SHA256 integrity hash of the remote file content.", + "type": "string", + "pattern": "^sha256-[A-Za-z0-9+/]{43}=$" + }, "rules": { "$ref": "#/definitions/includeRules" }, diff --git a/src/check_jsonschema/builtin_schemas/vendor/mergify.json b/src/check_jsonschema/builtin_schemas/vendor/mergify.json index b341bff6e..f3d423400 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/mergify.json +++ b/src/check_jsonschema/builtin_schemas/vendor/mergify.json @@ -1212,13 +1212,6 @@ "default": null, "description": "Template to use as the commit message when using the merge or squash merge method.", "title": "Commit Message Template" - }, - "allow_merging_configuration_change": { - "default": true, - "deprecated": true, - "description": "Allow merging the Mergify configuration file. *This option does not do anything and is only present for backward compatibility.*", - "title": "Allow Merging Configuration Change", - "type": "boolean" } }, "title": "MergeActionModel", @@ -1569,11 +1562,6 @@ "description": "The review decision. This indicates if `CODEOWNERS` have reviewed the pull request when the `Require Review from Code Owners` branch protection rule is enabled.", "title": "Branch protection review decision" }, - "queue-frozen": { - "description": "Whether the pull request is in a queue that is frozen.", - "title": "Queue frozen", - "type": "boolean" - }, "number": { "description": "The pull request number.", "minimum": 0, @@ -1724,18 +1712,6 @@ "description": "The name of the queue containing the pull request.", "title": "Queue name" }, - "queue-freeze-reason": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "null" - } - ], - "description": "The reason for the queue containing the pull request to be frozen.", - "title": "Queue freeze reason" - }, "queue-partition-name": { "anyOf": [ { @@ -2107,7 +2083,6 @@ "linear-history", "conflict", "branch-protection-review-decision", - "queue-frozen", "number", "queue-position", "author", @@ -2124,7 +2099,6 @@ "repository-full-name", "queue-dequeue-reason", "queue-name", - "queue-freeze-reason", "queue-partition-name", "assignee", "label", @@ -2401,13 +2375,6 @@ "description": "Allow merging the Mergify configuration file. *This option does not do anything and is only present for backward compatibility.*", "title": "Allow Merging Configuration Change", "type": "boolean" - }, - "autosquash": { - "default": true, - "deprecated": true, - "description": "This option is relevant only if you do in place checks and if you use the `rebase` option of the update_method. It will automatically squash your commits beginning by `squash!`, `fixup!` or `amend!`, just like the option with the same name when doing a `git rebase`.", - "title": "Autosquash", - "type": "boolean" } }, "title": "QueueActionModel", @@ -2437,15 +2404,6 @@ "QueueRuleModel": { "additionalProperties": false, "properties": { - "priority_rules": { - "$ref": "#/$defs/PriorityRulesModel", - "configuration_deprecated_attribute": { - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `priority_rules` attribute in the `queue_rules` section. The priority rules must now be set at the top level of the configuration file.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `priority_rules` attribute in the `queue_rules` section. The priority rules must now be set at the top level of the configuration file.**\nThis option will be removed on January 31st, 2025\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "deprecated": true, - "description": "*This attribute is deprecated in favor of `priority_rules` at the top level of the Mergify configuration file.* The list of priority rules a pull request can match in order to be prioritized when added to a queue. The rule with the highest priority value wins." - }, "queue_conditions": { "$ref": "#/$defs/QueueRuleMergeConditionsModel", "description": "The list of conditions that needs to match to queue the pull request." @@ -2664,23 +2622,6 @@ "title": "Disallow Checks Interruption From Queues", "type": "array" }, - "allow_checks_interruption": { - "anyOf": [ - { - "type": "boolean" - }, - { - "type": "null" - } - ], - "configuration_deprecated_attribute": { - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `allow_checks_interruption` attribute in the `queue_rules` section. This option must now be set at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `allow_checks_interruption` attribute in the `queue_rules` section. This option must now be set at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "default": null, - "deprecated": true, - "title": "Allow Checks Interruption" - }, "name": { "title": "Name", "type": "string" @@ -2695,15 +2636,6 @@ "QueueRuleModelForDefaults": { "additionalProperties": false, "properties": { - "priority_rules": { - "$ref": "#/$defs/PriorityRulesModel", - "configuration_deprecated_attribute": { - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `priority_rules` attribute in the `queue_rules` section. The priority rules must now be set at the top level of the configuration file.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `priority_rules` attribute in the `queue_rules` section. The priority rules must now be set at the top level of the configuration file.**\nThis option will be removed on January 31st, 2025\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "deprecated": true, - "description": "*This attribute is deprecated in favor of `priority_rules` at the top level of the Mergify configuration file.* The list of priority rules a pull request can match in order to be prioritized when added to a queue. The rule with the highest priority value wins." - }, "queue_conditions": { "$ref": "#/$defs/QueueRuleMergeConditionsModel", "description": "The list of conditions that needs to match to queue the pull request." @@ -2921,23 +2853,6 @@ "maxItems": 50, "title": "Disallow Checks Interruption From Queues", "type": "array" - }, - "allow_checks_interruption": { - "anyOf": [ - { - "type": "boolean" - }, - { - "type": "null" - } - ], - "configuration_deprecated_attribute": { - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `allow_checks_interruption` attribute in the `queue_rules` section. This option must now be set at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules", - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `allow_checks_interruption` attribute in the `queue_rules` section. This option must now be set at the top level of the configuration file in the `priority_rules` section.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#priority-rules" - }, - "default": null, - "deprecated": true, - "title": "Allow Checks Interruption" } }, "title": "QueueRuleModelForDefaults", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 index d75fcffb8..647cb5503 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 @@ -1 +1 @@ -bb1d6e2ddccbdc94a4ea84617fa89af57f6938b9ef72095583a31b6914c8ae1c \ No newline at end of file +c3463cad77fbd8f9e520c140b8bd337ff6c52190b9079e4661f4cf548ebf44b4 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 index 0b6155d29..9ffe1c1eb 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 @@ -1 +1 @@ -72980780f308c86943ff694531ca6f7cdc56afcddefd85d4cd11632f9c3f87ef \ No newline at end of file +a4e9db7fb53cb6dd91b3c71449b98f42d8e778ebf6cf1bd1b8c3224f3dce8bee \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 index 0697b7616..37f872873 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 @@ -1 +1 @@ -f48b339b4ea94722060efb40d884ce2089a48b6732ef666538958d08102f45a2 \ No newline at end of file +7570c1d2b90e172fdcc05906939e70aeb34c12e5c9ebc24f10600c68641762a5 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 index 3cadce6db..e30957b15 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 @@ -1 +1 @@ -898c7fc37bca50fd7b79b4181e59a4485051c3cd30412200bdfdd7351848f963 \ No newline at end of file +a5a886702e1102c86a72bcc676f5da57d697718a91f7ab529a9ac17def47c6b7 \ No newline at end of file From 6a01bef7bf8c33841ae95cf934d3f3cda607b7dd Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Wed, 19 Feb 2025 21:26:43 -0600 Subject: [PATCH 7/7] Bump version for release --- CHANGELOG.rst | 3 +++ README.md | 2 +- docs/optional_parsers.rst | 4 ++-- docs/precommit_usage.rst | 44 +++++++++++++++++++-------------------- pyproject.toml | 2 +- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4c1df3cc3..04cc5629f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,9 @@ Unreleased .. vendor-insert-here +0.31.2 +------ + - Update vendored schemas: dependabot, github-workflows, gitlab-ci, mergify, renovate, woodpecker-ci (2025-02-19) diff --git a/README.md b/README.md index 9390c4974..ecc10916d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ files. ```yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-github-workflows args: ["--verbose"] diff --git a/docs/optional_parsers.rst b/docs/optional_parsers.rst index b86e335d7..d0e89f1bc 100644 --- a/docs/optional_parsers.rst +++ b/docs/optional_parsers.rst @@ -20,7 +20,7 @@ For example, .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-renovate additional_dependencies: ['pyjson5'] @@ -45,7 +45,7 @@ For example, .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-jsonschema name: 'Check GitHub Workflows' diff --git a/docs/precommit_usage.rst b/docs/precommit_usage.rst index f57941211..aa595af7b 100644 --- a/docs/precommit_usage.rst +++ b/docs/precommit_usage.rst @@ -17,7 +17,7 @@ You must specify a schema using pre-commit ``args`` configuration. :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-jsonschema files: ^data/.*\.json$ @@ -34,7 +34,7 @@ Validate JSON Schema files against their matching metaschema, as specified in th :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-metaschema files: ^schemas/.*\.json$ @@ -52,7 +52,7 @@ Validate Azure Pipelines config against the schema provided by Microsoft :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-azure-pipelines @@ -66,7 +66,7 @@ Validate Bamboo Specs against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-bamboo-spec @@ -80,7 +80,7 @@ Validate Bitbucket Pipelines against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-bitbucket-pipelines @@ -94,7 +94,7 @@ Validate Buildkite Pipelines against the schema provided by Buildkite :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-buildkite @@ -108,7 +108,7 @@ Validate CircleCI config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-circle-ci @@ -122,7 +122,7 @@ Validate Google Cloud Build config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-cloudbuild @@ -136,7 +136,7 @@ Validate Docker Compose files against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-compose-spec @@ -150,7 +150,7 @@ Validate Dependabot Config (v2) against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-dependabot @@ -164,7 +164,7 @@ Validate Drone-CI Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-drone-ci @@ -178,7 +178,7 @@ Validate GitHub Actions against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-github-actions @@ -192,7 +192,7 @@ Validate GitHub Workflows against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-github-workflows @@ -206,7 +206,7 @@ Validate GitLab CI config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-gitlab-ci @@ -220,7 +220,7 @@ Validate Mergify config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-mergify @@ -234,7 +234,7 @@ Validate ReadTheDocs config against the schema provided by ReadTheDocs :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-readthedocs @@ -248,7 +248,7 @@ Validate Renovate config against the schema provided by Renovate (does not suppo :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-renovate @@ -262,7 +262,7 @@ Validate Taskfile config against the schema provided by Task :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-taskfile @@ -276,7 +276,7 @@ Validate Travis Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-travis @@ -290,7 +290,7 @@ Validate Woodpecker Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-woodpecker-ci @@ -316,7 +316,7 @@ manually, you could do this: .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-jsonschema name: "Check GitHub Workflows" @@ -335,7 +335,7 @@ To check with the builtin schema that a GitHub workflow sets .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.1 + rev: 0.31.2 hooks: - id: check-jsonschema name: "Check GitHub Workflows set timeout-minutes" diff --git a/pyproject.toml b/pyproject.toml index f875615c4..54349b0da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "check-jsonschema" -version = "0.31.1" +version = "0.31.2" description = "A jsonschema CLI and pre-commit hook" authors = [ { name = "Stephen Rosen", email = "sirosen0@gmail.com" },